X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-rh.spec;h=c0fba478150b94aa74a197cc25c262035ee2371f;hp=8374fa6f1585558e4f7c8c87a2109abe8d5a8e0a;hb=b46bec2d75a302aca443af62fca62a98d4d843d9;hpb=c000dd120c58729d2b5f34e240060af336b31908 diff --git a/privoxy-rh.spec b/privoxy-rh.spec index 8374fa6f..c0fba478 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-rh.spec,v 1.26 2002/04/22 16:24:36 morcego Exp $ +# $Id: privoxy-rh.spec,v 1.33 2002/05/25 02:08:23 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -37,11 +37,11 @@ Name: privoxy # ATTENTION # Version and release should be updated acordingly on configure.in and # configure. Otherwise, the package can be build with the wrong value -Version: 2.9.14 -Release: 2 +Version: 2.9.15 +Release: 1 Summary: Privoxy - privacy enhancing proxy License: GPL -Vendor: http://www.privoxy.org +Vendor: Privoxy.Org Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Group: Networking/Utilities @@ -66,6 +66,19 @@ Privoxy is based on the Internet Junkbuster. %setup -q -c %build + +# We check to see if versions match +VERSION_MAJOR=2 +VERSION_MINOR=9 +VERSION_POINT=15 + +CONFIG_VERSION=`cat configure.in | sed -n -e 's/^VERSION_MAJOR=\([0-9]*\)/\1./p' -e 's/^VERSION_MINOR=\([0-9]*\)/\1./p' -e 's/^VERSION_POINT=\([0-9]*\)/\1/p' | awk '{printf $1}'` +if [ "%{version}" != "${CONFIG_VERSION}" ]; then + echo "The version declared on the specfile does not match the version" + echo "declared on configure.in. This should not happen. The build will" + echo "be interrupted now, so you can fix it." + exit 1 +fi autoheader autoconf %configure --disable-dynamic-pcre @@ -215,13 +228,8 @@ fi #fi # We only remove it we this is not an upgrade if [ "$1" = "0" ]; then - # And only if this is not redhat, once redhat likes to have - # the uid and gid allocated even if the package is not - # installed - if [ ! -r /etc/redhat-release ]; then - /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true - id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - fi + /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true + id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true fi %clean @@ -235,6 +243,8 @@ fi %doc doc/webserver/user-manual %doc doc/webserver/faq %doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/index.html +%doc doc/webserver/images +%doc doc/webserver/man-page %dir %{privoxyconf} %dir %{privoxyconf}/templates @@ -246,45 +256,48 @@ fi # We should not use wildchars here. This could mask missing files problems # -- morcego # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! -%config %{privoxyconf}/config -%config %{privoxyconf}/advanced.action -%config %{privoxyconf}/basic.action -%config %{privoxyconf}/intermediate.action +%config(noreplace) %{privoxyconf}/config +%config %{privoxyconf}/standard.action +%config(noreplace) %{privoxyconf}/user.action %config %{privoxyconf}/default.action %config %{privoxyconf}/default.filter %config %{privoxyconf}/trust -%config %{privoxyconf}/templates/untrusted -%config %{privoxyconf}/templates/toggle-mini -%config %{privoxyconf}/templates/default -%config %{privoxyconf}/templates/connect-failed -%config %{privoxyconf}/templates/show-status-file +# Please keep these alphabetized so its easier to find one that +# is not included. +%config %{privoxyconf}/templates/blocked +%config %{privoxyconf}/templates/cgi-error-404 %config %{privoxyconf}/templates/cgi-error-bad-param -%config %{privoxyconf}/templates/show-version +%config %{privoxyconf}/templates/cgi-error-disabled %config %{privoxyconf}/templates/cgi-error-file -%config %{privoxyconf}/templates/cgi-error-404 +%config %{privoxyconf}/templates/cgi-error-file-read-only +%config %{privoxyconf}/templates/cgi-error-modified %config %{privoxyconf}/templates/cgi-error-parse -%config %{privoxyconf}/templates/edit-actions-url-form -%config %{privoxyconf}/templates/no-such-domain -%config %{privoxyconf}/templates/edit-actions-add-url-form %config %{privoxyconf}/templates/cgi-style.css +%config %{privoxyconf}/templates/connect-failed +%config %{privoxyconf}/templates/default +%config %{privoxyconf}/templates/edit-actions-add-url-form +%config %{privoxyconf}/templates/edit-actions-for-url %config %{privoxyconf}/templates/edit-actions-for-url-filter -%config %{privoxyconf}/templates/cgi-error-disabled -%config %{privoxyconf}/templates/edit-actions-remove-url-form -%config %{privoxyconf}/templates/show-request -%config %{privoxyconf}/templates/cgi-error-modified -%config %{privoxyconf}/templates/mod-unstable-warning %config %{privoxyconf}/templates/edit-actions-list -%config %{privoxyconf}/templates/toggle +%config %{privoxyconf}/templates/edit-actions-list-button %config %{privoxyconf}/templates/edit-actions-list-section -%config %{privoxyconf}/templates/mod-title %config %{privoxyconf}/templates/edit-actions-list-url -%config %{privoxyconf}/templates/show-status -%config %{privoxyconf}/templates/blocked -%config %{privoxyconf}/templates/mod-support-and-service +%config %{privoxyconf}/templates/edit-actions-remove-url-form +%config %{privoxyconf}/templates/edit-actions-url-form %config %{privoxyconf}/templates/mod-local-help +%config %{privoxyconf}/templates/mod-support-and-service +%config %{privoxyconf}/templates/mod-title +%config %{privoxyconf}/templates/mod-unstable-warning +%config %{privoxyconf}/templates/no-such-domain +%config %{privoxyconf}/templates/show-request +%config %{privoxyconf}/templates/show-status +%config %{privoxyconf}/templates/show-status-file %config %{privoxyconf}/templates/show-url-info -%config %{privoxyconf}/templates/edit-actions-for-url +%config %{privoxyconf}/templates/show-version +%config %{privoxyconf}/templates/toggle +%config %{privoxyconf}/templates/toggle-mini +%config %{privoxyconf}/templates/untrusted %config %{_sysconfdir}/logrotate.d/%{name} %config %attr(0744,root,root) %{_sysconfdir}/rc.d/init.d/%{name} @@ -299,6 +312,36 @@ fi %{_mandir}/man1/%{name}.* %changelog +* Fri May 24 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add another template and alphabetize these for easier tracking. +- Add doc/images directory. + +* Wed May 15 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add templates/edit-actions-list-button + +* Fri May 03 2002 Rodrigo Barbosa ++ privoxy-2.9.15-1 +- Version bump +- Adding noreplace for %%{privoxyconf}/config +- Included a method to verify if the versions declared on the specfile and + configure.in match. Interrupt the build if they don't. + +* Fri Apr 26 2002 Rodrigo Barbosa ++ privoxy-2.9.14-3 +- Changing Vendor to Privoxy.Org + +* Tue Apr 23 2002 Hal Burgiss ++ privoxy-2.9.14-2 +- Adjust for new *actions files. + +* Mon Apr 22 2002 Rodrigo Barbosa ++ privoxy-2.9.14-2 +- Removed the redhat hack that prevented the user and group from + being dealocated. That was a misundestanding of my part regarding + redhat policy. + * Mon Apr 22 2002 Rodrigo Barbosa + privoxy-2.9.14-2 - Using macros to define uid and gid values @@ -616,6 +659,34 @@ fi additional "-r @" flag. # $Log: privoxy-rh.spec,v $ +# Revision 1.33 2002/05/25 02:08:23 hal9 +# Add doc/images directory. +# Redhat: alphabetized list of templates (and I think added one in the process) +# +# Revision 1.32 2002/05/16 01:37:29 hal9 +# Add new template file so CGI stuff works :) +# +# Revision 1.31 2002/05/03 17:14:35 morcego +# *.spec: Version bump to 2.9.15 +# -rh.spec: noreplace for %%{privoxyconf}/config +# Will interrupt the build if versions from configure.in and +# specfile do not match +# +# Revision 1.30 2002/04/26 15:51:05 morcego +# Changing Vendor value to Privoxy.Org +# +# Revision 1.29 2002/04/24 03:13:51 hal9 +# New actions files changes. +# +# Revision 1.28 2002/04/22 18:51:33 morcego +# user and group now get removed on rh too. +# +# Revision 1.27 2002/04/22 16:32:31 morcego +# configure.in, *.spec: Bumping release to 2 (2.9.14-2) +# -rh.spec: uid and gid are now macros +# -suse.spec: Changing the header Copyright to License (Copyright is +# deprecable) +# # Revision 1.26 2002/04/22 16:24:36 morcego # - Changes to fixate the uid and gid values as (both) 73. This is a # value we hope to standarize for all distributions. RedHat already