SPECS: privoxy.spec - release 2.2: further cleanup - BR: pcre-deve...
radek
radek at pld-linux.org
Sun Nov 13 16:24:11 CET 2005
Author: radek Date: Sun Nov 13 15:24:11 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- release 2.2: further cleanup
- BR: pcre-devel, removed --disable-dynamic-pcre
- License: GPL v2+ (as README says)
- added -DESTDIR.patch
- NOTE: should it be built with -pthread?
---- Files affected:
SPECS:
privoxy.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: SPECS/privoxy.spec
diff -u SPECS/privoxy.spec:1.17 SPECS/privoxy.spec:1.18
--- SPECS/privoxy.spec:1.17 Sun Nov 13 00:56:25 2005
+++ SPECS/privoxy.spec Sun Nov 13 16:24:03 2005
@@ -3,17 +3,19 @@
Summary(pl): Privoxy - proxy rozszerzające prywatność
Name: privoxy
Version: 3.0.3
-Release: 2.1
-License: GPL
+Release: 2.2
+License: GPL v2+
Source0: http://dl.sourceforge.net/ijbswa/%{name}-%{version}-2-stable.src.tar.gz
# Source0-md5: d7f6c2fcb926e6110659de6e866b21e4
Source1: %{name}.init
Source2: %{name}.logrotate
+Patch0: %{name}-DESTDIR.patch
Group: Networking/Daemons
URL: http://www.privoxy.org/
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: lynx
+BuildRequires: pcre-devel
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.231
PreReq: rc-scripts
@@ -51,70 +53,30 @@
Privoxy jest oparte na Internet Junkbusterze.
%prep
-%setup -qcT
-tar xf %{SOURCE0} --strip-components=1
+%setup -q -n %{name}-%{version}-stable
+%patch0 -p0
%build
%{__autoheader}
%{__autoconf}
-%configure \
- --disable-dynamic-pcre
+%configure
-%{__make}
+%{__make} \
+ CFLAGS="%{rpmcflags}"
+# XXX: above supresses -pthread; should it be added?
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sbindir} \
- $RPM_BUILD_ROOT%{_mandir}/man1 \
- $RPM_BUILD_ROOT/var/log/%{name} \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates \
- $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d} \
- $RPM_BUILD_ROOT/var/log/%{name}
-
-install -m 744 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
-
-# Using sed to "convert" from DOS format to UNIX
-# This is important behaviour, and should not be removed without some
-# other assurance that these files don't get packed in the the
-# wrong format
-for i in `ls *.action`
-do
- sed -e 's/[[:cntrl:]]*$//' $i > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$i
-done
-sed -e 's/[[:cntrl:]]*$//' default.filter > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.filter
-sed -e 's/[[:cntrl:]]*$//' trust > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/trust
-(
-cd templates
-for i in `ls`
-do
- sed -e 's/[[:cntrl:]]*$//' $i > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates/$i
-done
-)
-
-cp -f %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-cp -f %{name}.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-
-# verify all file locations, etc. in the config file
-# don't start with ^ or commented lines are not replaced
-## Changing the sed paramter delimiter to @, so we don't have to
-## escape the slashes
-cat config | \
- sed 's@^confdir.*@confdir %{_sysconfdir}/%{name}@g' | \
-# sed 's/^permissionsfile.*/permissionsfile \/etc\/%{name}\/permissionsfile/g' | \
-# sed 's/^filterfile.*/default.filter \/etc\/%{name}\/default.filter/g' | \
-# sed 's/^logfile.*/logfile \/var\/log\/%{name}\/logfile/g' | \
-# sed 's/^jarfile.*/jarfile \/var\/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' | \
- sed -e 's/[[:cntrl:]]*$//' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config
- perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.action
+%{__make} install \
+ CONF_BASE=/etc/privoxy \
+ DESTDIR=$RPM_BUILD_ROOT
+
+install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+
+# just GPLv2
+rm -f $RPM_BUILD_ROOT/usr/share/doc/privoxy/LICENSE
%clean
rm -rf $RPM_BUILD_ROOT
@@ -141,21 +103,13 @@
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-%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
-%doc doc/webserver/*.css doc/webserver/privoxy-index.html
-%doc doc/webserver/images
-%doc doc/webserver/man-page
-
-%config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/%{name}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
%attr(755,root,root) %{_sbindir}/%{name}
%{_mandir}/man1/%{name}.*
+%config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
%dir %attr(751,privoxy,privoxy) /var/log/%{name}
+%ghost %attr(640,privoxy,privoxy) %verify(not size mtime md5) /var/log/%{name}/*
%dir %attr(751,root,privoxy) %{_sysconfdir}/%{name}
%dir %attr(751,root,privoxy) %{_sysconfdir}/%{name}/templates
@@ -164,12 +118,21 @@
%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*.*
%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/templates/*
+%doc $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/*
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2005/11/13 15:24:03 radek
+- release 2.2: further cleanup
+- BR: pcre-devel, removed --disable-dynamic-pcre
+- License: GPL v2+ (as README says)
+- added -DESTDIR.patch
+- NOTE: should it be built with -pthread?
+
Revision 1.17 2005/11/12 23:56:25 radek
- release 2.1; cleanup, but still too crappy for integer R:
- removed O: junkbuster (never present in PLD)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/privoxy.spec?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list