Author: glen Date: Mon Feb 27 23:21:28 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service
---- Files affected: SPECS: ez-ipupdate.spec (1.10 -> 1.11) , fakebo.spec (1.22 -> 1.23) , fam.spec (1.48 -> 1.49) , fetchmail.spec (1.226 -> 1.227) , filtergen.spec (1.24 -> 1.25) , freeradius.spec (1.58 -> 1.59) , frox.spec (1.47 -> 1.48) ---- Diffs: ================================================================ Index: SPECS/ez-ipupdate.spec diff -u SPECS/ez-ipupdate.spec:1.10 SPECS/ez-ipupdate.spec:1.11 --- SPECS/ez-ipupdate.spec:1.10 Mon Dec 12 16:19:32 2005 +++ SPECS/ez-ipupdate.spec Tue Feb 28 00:21:21 2006 @@ -4,8 +4,8 @@ Name: ez-ipupdate Version: 3.0.11b8 Release: 4 -Group: Networking License: GPL +Group: Networking Source0: http://ez-ipupdate.com/dist/%{name}-%{version}.tar.gz # Source0-md5: 000211add4c4845ffa4211841bff4fb0 Source1: %{name}.init @@ -15,6 +15,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -38,8 +39,8 @@ It is pure C and works on Linux, *BSD and Solaris. Don't forget to create your own config file (in -/etc/ez-ipupdate.conf). You can find some example in -/usr/share/doc/%{name}-%{version}. +/etc/ez-ipupdate.conf). You can find some examples in +%{_docdir}/%{name}-%{version}. %description -l pl ez-ipupdate to małe narzędzie do uaktualniania nazwy hosta w dowolnym @@ -61,7 +62,7 @@ Nie należy zapomnieć o utworzeniu własnego pliku konfiguracyjnego (/etc/ez-ipupdate.conf). Przykład można znaleźć w katalogu -/usr/share/doc/%{name}-%{version}. +%{_docdir}/%{name}-%{version}. %prep %setup -q @@ -92,17 +93,11 @@ %post /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart >&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon." -fi +%service %{name} restart "%{name} daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop >&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -120,6 +115,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2006/02/27 23:21:21 glen +- use %service + Revision 1.10 2005/12/12 15:19:32 glen - adapterized (sorted %verify flags) ================================================================ Index: SPECS/fakebo.spec diff -u SPECS/fakebo.spec:1.22 SPECS/fakebo.spec:1.23 --- SPECS/fakebo.spec:1.22 Sat Oct 1 16:47:31 2005 +++ SPECS/fakebo.spec Tue Feb 28 00:21:21 2006 @@ -11,8 +11,9 @@ Source1: %{name}.init URL: http://cvs.linux.hr/fakebo/ BuildRequires: autoconf -Requires: rc-scripts +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -48,18 +49,11 @@ %post /sbin/chkconfig --add fakebo -if [ -f /var/lock/subsys/fakebo ]; then - /etc/rc.d/init.d/fakebo restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/fakebo start\" to start fakebo daemon." -fi - +%service fakebo restart "fakebo daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/fakebo ]; then - /etc/rc.d/init.d/fakebo stop 1>&2 - fi + %service fakebo stop /sbin/chkconfig --del fakebo fi @@ -77,6 +71,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2006/02/27 23:21:21 glen +- use %service + Revision 1.22 2005/10/01 14:47:31 darekr - sort verify() flags, PreReq -> Requires ================================================================ Index: SPECS/fam.spec diff -u SPECS/fam.spec:1.48 SPECS/fam.spec:1.49 --- SPECS/fam.spec:1.48 Tue Feb 21 15:09:33 2006 +++ SPECS/fam.spec Tue Feb 28 00:21:21 2006 @@ -22,6 +22,7 @@ BuildRequires: automake BuildRequires: libstdc++-devel BuildRequires: libtool +BuildRequires: rpmbuild(macros) >= 1.268 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -188,30 +189,20 @@ rm -rf $RPM_BUILD_ROOT %post inetd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload 1>&2 -else - echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2 -fi +%service -q rc-inetd reload %postun inetd -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload +if [ "$1" = 0 ]; then + %service -q rc-inetd reload fi %post standalone /sbin/chkconfig --add famd -if [ -f /var/lock/subsys/famd ]; then - /etc/rc.d/init.d/famd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/famd start\" to start FAM daemon." -fi +%service famd restart "FAM daemon" %preun standalone if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/famd ]; then - /etc/rc.d/init.d/famd stop 1>&2 - fi + %service famd stop /sbin/chkconfig --del famd fi @@ -256,6 +247,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2006/02/27 23:21:21 glen +- use %service + Revision 1.48 2006/02/21 14:09:33 qboosh - don't use epoch when not defined ================================================================ Index: SPECS/fetchmail.spec diff -u SPECS/fetchmail.spec:1.226 SPECS/fetchmail.spec:1.227 --- SPECS/fetchmail.spec:1.226 Wed Jan 25 22:56:57 2006 +++ SPECS/fetchmail.spec Tue Feb 28 00:21:21 2006 @@ -32,7 +32,7 @@ BuildRequires: flex BuildRequires: gettext-devel %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} -BuildRequires: rpmbuild(macros) >= 1.219 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: setup >= 2.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -210,17 +210,11 @@ %post daemon /sbin/chkconfig --add fetchmail -if [ -f /var/lock/subsys/fetchmail ]; then - /etc/rc.d/init.d/fetchmail restart >&2 -else - echo "Run \"/etc/rc.d/init.d/fetchmail start\" to start fetchmail daemon." -fi +%service fetchmail restart "fetchmail daemon" %preun daemon if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/fetchmail ]; then - /etc/rc.d/init.d/fetchmail stop >&2 - fi + %service fetchmail stop /sbin/chkconfig --del fetchmail fi @@ -250,6 +244,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.227 2006/02/27 23:21:21 glen +- use %service + Revision 1.226 2006/01/25 21:56:57 qboosh - updated to 6.3.2 (fixes CVE-2006-0321) - removed obsolete pl.po-update patch ================================================================ Index: SPECS/filtergen.spec diff -u SPECS/filtergen.spec:1.24 SPECS/filtergen.spec:1.25 --- SPECS/filtergen.spec:1.24 Mon Dec 12 17:24:19 2005 +++ SPECS/filtergen.spec Tue Feb 28 00:21:21 2006 @@ -13,6 +13,7 @@ Source3: filter.init URL: http://hairy.beasts.org/filter/ BuildRequires: flex +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts Provides: firewall @@ -74,17 +75,11 @@ %post /sbin/chkconfig --add filtergen -if [ -f /var/lock/subsys/filtergen ]; then - /etc/rc.d/init.d/filtergen restart >&2 -else - echo "Run \"/etc/rc.d/init.d/filtergen start\" to start filtergen" -fi +%service filtergen restart "filtergen" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/filtergen ]; then - /etc/rc.d/init.d/filtergen stop >&2 - fi + %service filtergen stop /sbin/chkconfig --del filtergen fi @@ -107,6 +102,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2006/02/27 23:21:21 glen +- use %service + Revision 1.24 2005/12/12 16:24:19 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/freeradius.spec diff -u SPECS/freeradius.spec:1.58 SPECS/freeradius.spec:1.59 --- SPECS/freeradius.spec:1.58 Tue Feb 7 23:36:39 2006 +++ SPECS/freeradius.spec Tue Feb 28 00:21:21 2006 @@ -34,6 +34,7 @@ BuildRequires: libltdl-devel BuildRequires: libtool BuildRequires: mysql-devel +BuildRequires: net-snmp-devel BuildRequires: openldap-devel >= 2.3.0 BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pam-devel @@ -42,22 +43,22 @@ BuildRequires: postgresql-devel BuildRequires: python BuildRequires: python-devel -BuildRequires: net-snmp-devel -BuildRequires: unixODBC-devel BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.202 -Requires(pre): /usr/bin/getgid +BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: unixODBC-devel +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/usermod Requires(pre): /usr/sbin/useradd -Requires(postun): /usr/sbin/userdel -Requires(postun): /usr/sbin/groupdel -Requires(post,preun): /sbin/chkconfig +Requires(pre): /usr/sbin/usermod Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION') Requires: rc-scripts -Provides: user(radius) Provides: group(radius) +Provides: user(radius) Obsoletes: cistron-radius BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -165,17 +166,11 @@ %post /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon." -fi +%service %{name} restart "%{name} daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop 1>&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -218,6 +213,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.59 2006/02/27 23:21:21 glen +- use %service + Revision 1.58 2006/02/07 22:36:39 qboosh - unified, killed PreReq ================================================================ Index: SPECS/frox.spec diff -u SPECS/frox.spec:1.47 SPECS/frox.spec:1.48 --- SPECS/frox.spec:1.47 Tue Feb 28 00:19:45 2006 +++ SPECS/frox.spec Tue Feb 28 00:21:21 2006 @@ -22,17 +22,17 @@ URL: http://frox.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: rpmbuild(macros) >= 1.202 -PreReq: rc-scripts +BuildRequires: rpmbuild(macros) >= 1.268 +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/groupmod Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel -Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts Provides: group(frox) Provides: user(frox) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -103,17 +103,11 @@ %post /sbin/chkconfig --add frox -if [ -f /var/lock/subsys/frox ]; then - /etc/rc.d/init.d/frox restart >&2 -else - echo "Run \"/etc/rc.d/init.d/frox start\" to start frox daemons." -fi +%service frox restart "frox daemons" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/frox ]; then - /etc/rc.d/init.d/frox stop >&2 - fi + %service frox stop /sbin/chkconfig --del frox fi @@ -143,6 +137,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.48 2006/02/27 23:21:21 glen +- use %service + Revision 1.47 2006/02/27 23:19:45 glen - fix uid/gid migration ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ez-ipupdate.spec?r1=1.10&r2=1.11&f=u http://cvs.pld-linux.org/SPECS/fakebo.spec?r1=1.22&r2=1.23&f=u http://cvs.pld-linux.org/SPECS/fam.spec?r1=1.48&r2=1.49&f=u http://cvs.pld-linux.org/SPECS/fetchmail.spec?r1=1.226&r2=1.227&f=u http://cvs.pld-linux.org/SPECS/filtergen.spec?r1=1.24&r2=1.25&f=u http://cvs.pld-linux.org/SPECS/freeradius.spec?r1=1.58&r2=1.59&f=u http://cvs.pld-linux.org/SPECS/frox.spec?r1=1.47&r2=1.48&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
