X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-rh.spec;h=fa406a861f628e39993b6b8055eb31f26717cb69;hp=1016e53b53817548d80df2a4135dc26f26109e5e;hb=6977919118a2eed09564e47947db19751677f42d;hpb=e10b017ffb854da04af7218c1e3b7299091a9f37

diff --git a/privoxy-rh.spec b/privoxy-rh.spec
index 1016e53b..fa406a86 100644
--- a/privoxy-rh.spec
+++ b/privoxy-rh.spec
@@ -1,4 +1,4 @@
-# $Id: privoxy-rh.spec,v 1.51 2006/11/18 14:37:12 fabiankeil Exp $
+# $Id: privoxy-rh.spec,v 1.59 2008/08/13 16:57:46 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2006 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -35,13 +35,13 @@
 
 Name: privoxy
 # ATTENTION
-# Version and release should be updated acordingly on configure.in and
+# Version and release should be updated accordingly on configure.in and
 # configure. Otherwise, the package can be build with the wrong value
-Version: 3.0.6
+Version: 3.0.10
 Release: 1
 Summary: Privoxy - privacy enhancing proxy
 License: GPL
-Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz
+Source0: http://dl.sf.net/ijbswa/%{name}-%{version}-stable-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Group: System Environment/Daemons
 URL: http://www.privoxy.org/
@@ -62,14 +62,15 @@ for both stand-alone systems and multi-user networks.
 Privoxy is based on the Internet Junkbuster.
 
 %prep
-%setup -q -c
+#%setup -q -c
+%setup -q -n "%{name}-%{version}-stable"
 
 %build
 
 # We check to see if versions match
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=6
+VERSION_POINT=10
 
 # find CVS files and remove it.
 find -name CVS | xargs rm -rf
@@ -143,7 +144,6 @@ cat config | \
 #    sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
 #    sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
 #    sed 's/^logfile.*/logfile \%{_localstatedir}\/log\/%{name}\/logfile/g' | \
-#    sed 's/^jarfile.*/jarfile \%{_localstatedir}\/log\/%{name}\/jarfile/g' | \
 #    sed 's/^forward.*/forward \/etc\/%{name}\/forward/g' | \
 #    sed 's/^aclfile.*/aclfile \/etc\/%{name}\/aclfile/g' > \
     sed 's@^logdir.*@logdir %{_localstatedir}/log/%{name}@g' | \
@@ -249,7 +249,7 @@ fi
 %files
 %defattr(0644,root,root,0755)
 %doc README AUTHORS ChangeLog LICENSE 
-%doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
+#%doc doc/text/developer-manual.txt doc/text/user-manual.txt doc/text/faq.txt
 %doc doc/webserver/developer-manual
 %doc doc/webserver/user-manual
 %doc doc/webserver/faq
@@ -275,6 +275,7 @@ fi
 %config(noreplace) %{privoxyconf}/user.action
 %config %{privoxyconf}/default.action
 %config %{privoxyconf}/default.filter
+%config %{privoxyconf}/regression-tests.action
 %config(noreplace) %{privoxyconf}/user.filter
 %config(noreplace) %{privoxyconf}/trust
 
@@ -291,6 +292,7 @@ fi
 %config %{privoxyconf}/templates/cgi-style.css
 %config %{privoxyconf}/templates/connect-failed
 %config %{privoxyconf}/templates/default
+%config %{privoxyconf}/templates/forwarding-failed
 %config %{privoxyconf}/templates/edit-actions-add-url-form
 %config %{privoxyconf}/templates/edit-actions-for-url
 %config %{privoxyconf}/templates/edit-actions-for-url-filter
@@ -313,6 +315,7 @@ fi
 %config %{privoxyconf}/templates/toggle
 %config %{privoxyconf}/templates/toggle-mini
 %config %{privoxyconf}/templates/untrusted
+%config %{privoxyconf}/templates/url-info-osd.xml
 
 # Attention, new defattr change here !
 %defattr(0644,root,root,0755)
@@ -323,6 +326,9 @@ fi
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Sat Jun 18 2008 Hal Burgiss <hal@foobox.net>
+- Remove reference to txt docs.
+
 * Sat Oct 18 2006 Hal Burgiss <hal@foobox.net>
 - Bump version to 3.0.6
 
@@ -759,6 +765,33 @@ fi
 	additional "-r @" flag.
 
 # $Log: privoxy-rh.spec,v $
+# Revision 1.59  2008/08/13 16:57:46  fabiankeil
+# Change version to 3.0.10.
+#
+# Revision 1.58  2008/06/19 01:52:17  hal9
+# Remove txt docs from spec file.
+#
+# Revision 1.57  2008/05/30 15:06:42  fabiankeil
+# - Add %config directive for url-info-osd.xml.
+#   As usual, this hasn't been tested.
+# - Fix comment typo.
+#
+# Revision 1.56  2008/03/16 14:17:25  fabiankeil
+# Add %config lines for regression-tests.action and forwarding-failed.
+# This might or might not help with #1915185, reported by Bernardo Bacic.
+#
+# Revision 1.55  2008/03/02 17:36:43  fabiankeil
+# Set version to 3.0.9.
+#
+# Revision 1.54  2008/01/20 14:30:59  fabiankeil
+# Set version to 3.0.8.
+#
+# Revision 1.53  2006/11/28 11:34:35  hal9
+# Fix the prep section per Support request so it actually builds.
+#
+# Revision 1.52  2006/11/18 17:36:53  hal9
+# Ooops, bumping version to 3.0.6
+#
 # Revision 1.51  2006/11/18 14:37:12  fabiankeil
 # Bump version to 3.0.6.
 #