Author: glen                         Date: Tue Mar 14 01:24:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified rc-inetd usage (via %service), adapterized

---- Files affected:
SPECS:
   amanda.spec (1.136 -> 1.137) , atftp.spec (1.16 -> 1.17) , bftpd.spec (1.36 
-> 1.37) , bincimap.spec (1.14 -> 1.15) , bootp.spec (1.30 -> 1.31) , 
bsd-finger.spec (1.66 -> 1.67) , cfingerd.spec (1.42 -> 1.43) , cipe.spec (1.47 
-> 1.48) , comsat.spec (1.25 -> 1.26) , cvs-nserver.spec (1.85 -> 1.86) , 
cvs.spec (1.164 -> 1.165) , efingerd.spec (1.23 -> 1.24) , ffingerd.spec (1.49 
-> 1.50) , ftpd-BSD.spec (1.69 -> 1.70) , ftpproxy.spec (1.15 -> 1.16) , 
glftpd.spec (1.10 -> 1.11) , imap.spec (1.95 -> 1.96) , inetutils.spec (1.9 -> 
1.10) , intimed.spec (1.28 -> 1.29) , leafnode+.spec (1.38 -> 1.39) , 
leafnode.spec (1.66 -> 1.67) , linux-ftpd.spec (1.21 -> 1.22) , midentd.spec 
(1.25 -> 1.26) , miniserv.spec (1.12 -> 1.13) , nidentd.spec (1.8 -> 1.9) , 
noffle.spec (1.13 -> 1.14) , ntalk.spec (1.49 -> 1.50) , pidentd.spec (1.53 -> 
1.54) , pop3proxy.spec (1.18 -> 1.19) , popa3d.spec (1.20 -> 1.21) , 
poppassd.spec (1.21 -> 1.22) , rsh.spec (1.39 -> 1.40) , rshproxy.spec (1.14 -> 
1.15) , sane-backends.spec (1.109 -> 1.110) , smtpproxy.spec (1.15 -> 1.16) , 
solid-pop3d.spec (1.79 -> 1.80) , teapop.spec (1.41 -> 1.42) , telnet.spec 
(1.76 -> 1.77) , tftp-hpa.spec (1.42 -> 1.43) , tftp.spec (1.67 -> 1.68) , 
utftpd.spec (1.69 -> 1.70) , uucp.spec (1.46 -> 1.47) , wu-ftpd.spec (1.53 -> 
1.54) , zabbix.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/amanda.spec
diff -u SPECS/amanda.spec:1.136 SPECS/amanda.spec:1.137
--- SPECS/amanda.spec:1.136     Tue Jan 24 10:19:45 2006
+++ SPECS/amanda.spec   Tue Mar 14 02:24:26 2006
@@ -24,13 +24,11 @@
 URL:           http://www.amanda.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
-BuildRequires: cpio
 BuildRequires: dump
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: readline-devel >= 4.2
-BuildRequires: rpmbuild(macros) >= 1.202
-BuildRequires: tar
+BuildRequires: rpmbuild(macros) >= 1.268
 %{?with_xfs:BuildRequires:     xfsdump}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -214,33 +212,25 @@
 
 %post client
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 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 client
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %post server
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 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
 if [ "$1" = "1" ]; then
        echo "Don't forget to edit /etc/cron.d/amanda-srv." 1>&2
 fi
 
 %postun server
 /sbin/ldconfig
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %files libs
@@ -363,6 +353,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.136  2006/01/24 09:19:45  qboosh
 - pass more command paths (mail,lpr,dump,restore,xfsdump,xfsrestore)
 - release 4

================================================================
Index: SPECS/atftp.spec
diff -u SPECS/atftp.spec:1.16 SPECS/atftp.spec:1.17
--- SPECS/atftp.spec:1.16       Sat Sep 17 21:05:37 2005
+++ SPECS/atftp.spec    Tue Mar 14 02:24:26 2006
@@ -14,9 +14,9 @@
 Source1:       %{name}d.inetd
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libwrap-devel
 BuildRequires: libtool
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: libwrap-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,16 +51,16 @@
 Summary(pl):   Serwer tftp (trivial file transfer protocol)
 Summary(tr):   Ýlkel dosya aktarým protokolu (TFTP) için sunucu ve istemci
 Group:         Networking/Daemons
-PreReq:                rc-inetd >= 0.8.1
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
+Requires:      rc-inetd >= 0.8.1
 Provides:      tftpdaemon
 Provides:      user(tftp)
 Obsoletes:     inetutils-tftpd
+Obsoletes:     tftp-server
 Obsoletes:     tftpd
 Obsoletes:     tftpd-hpa
-Obsoletes:     tftp-server
 Obsoletes:     utftpd
 
 %description -n atftpd
@@ -119,17 +119,11 @@
 %useradd -u 15 -r -d /var/lib/tftp -s /bin/false -c "TFTP User" -g ftp tftp
 
 %post -n atftpd
-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 -n atftpd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd reload
-fi
 if [ "$1" = "0" ]; then
+       %service -q rc-inetd reload
        %userremove tftp
 fi
 
@@ -152,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.16  2005/09/17 19:05:37  arekm
 - rel 6
 

================================================================
Index: SPECS/bftpd.spec
diff -u SPECS/bftpd.spec:1.36 SPECS/bftpd.spec:1.37
--- SPECS/bftpd.spec:1.36       Mon Dec 12 16:19:32 2005
+++ SPECS/bftpd.spec    Tue Mar 14 02:24:26 2006
@@ -15,13 +15,13 @@
 URL:           http://www.bftpd.org/
 Patch0:                %{name}-NOROOT.patch
 BuildRequires: autoconf
-Requires:      rc-inetd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      inetdaemon
+Requires:      rc-inetd
 Provides:      ftpserver
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     ftpserver
 Obsoletes:     anonftp
 Obsoletes:     ftpd-BSD
+Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     linux-ftpd
@@ -35,6 +35,7 @@
 Obsoletes:     vsftpd
 Obsoletes:     wu-ftpd
 Conflicts:     man-pages < 1.51
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 bftpd is a Linux FTP server with chroot and setreuid. Not all FTP
@@ -74,15 +75,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 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
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = "0" ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -109,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.36  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/bincimap.spec
diff -u SPECS/bincimap.spec:1.14 SPECS/bincimap.spec:1.15
--- SPECS/bincimap.spec:1.14    Mon Dec 12 16:19:32 2005
+++ SPECS/bincimap.spec Tue Mar 14 02:24:26 2006
@@ -16,8 +16,9 @@
 BuildRequires: automake
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel >= 0.9.7d
-Requires:      rc-inetd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      checkpassword-pam
+Requires:      rc-inetd
 Conflicts:     courier-imap
 Conflicts:     cyrus-imapd
 Conflicts:     imap
@@ -65,15 +66,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -92,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.14  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/bootp.spec
diff -u SPECS/bootp.spec:1.30 SPECS/bootp.spec:1.31
--- SPECS/bootp.spec:1.30       Sun Dec  4 23:34:26 2005
+++ SPECS/bootp.spec    Tue Mar 14 02:24:26 2006
@@ -18,6 +18,7 @@
 Patch3:                %{name}-2.4.3-pathfix.patch
 Patch4:                %{name}-tmprace.patch
 Patch5:                %{name}-errno.patch
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      inetdaemon
 Requires:      rc-inetd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,15 +92,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -115,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.30  2005/12/04 22:34:26  glen
 - adapterized (sorted verify flags)
 

================================================================
Index: SPECS/bsd-finger.spec
diff -u SPECS/bsd-finger.spec:1.66 SPECS/bsd-finger.spec:1.67
--- SPECS/bsd-finger.spec:1.66  Thu Mar  9 15:35:10 2006
+++ SPECS/bsd-finger.spec       Tue Mar 14 02:24:26 2006
@@ -8,11 +8,11 @@
 Summary(ru):   ëĚÉĹÎÔ finger
 Summary(tr):   Finger istemcisi
 Summary(uk):   ëĚŚ¤ÎÔ finger
-Group:         Networking/Utilities
 Name:          bsd-finger
 Version:       0.17
 Release:       11
 License:       BSD
+Group:         Networking/Utilities
 Source0:       
ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/%{name}-%{version}.tar.gz
 # Source0-md5: 52bf281aac8814bf56cdc92f7661ee75
 Source1:       
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -26,6 +26,7 @@
 Patch4:                %{name}-gecos.patch
 Patch5:                %{name}-rfc742.patch
 Patch6:                %{name}-typo.patch
+BuildRequires: rpmbuild(macros) >= 1.268
 Obsoletes:     finger
 Obsoletes:     finger-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,13 +89,13 @@
 Summary(tr):   Finger sunucusu
 Summary(uk):   äĹÍĎÎ finger
 Group:         Networking/Daemons
-Prereq:                rc-inetd >= 0.8.1
+Requires:      rc-inetd >= 0.8.1
 Provides:      fingerd
-Obsoletes:     fingerd
+Obsoletes:     cfingerd
 Obsoletes:     efingerd
 Obsoletes:     ffingerd
-Obsoletes:     cfingerd
 Obsoletes:     finger-server
+Obsoletes:     fingerd
 
 %description -n bsd-fingerd
 Finger is a simple protocol which allows users to find information
@@ -175,15 +176,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n bsd-fingerd
-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 -n bsd-fingerd
-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
 
 %files
@@ -208,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.66  2006/03/09 14:35:10  glen
 - quote %{__cc}
 

================================================================
Index: SPECS/cfingerd.spec
diff -u SPECS/cfingerd.spec:1.42 SPECS/cfingerd.spec:1.43
--- SPECS/cfingerd.spec:1.42    Mon Dec 12 16:19:32 2005
+++ SPECS/cfingerd.spec Tue Mar 14 02:24:26 2006
@@ -6,7 +6,6 @@
 Release:       13
 License:       GPL
 Group:         Networking/Daemons
-Vendor:                Martin Schulze <[EMAIL PROTECTED]>
 URL:           http://www.infodrom.north.de/cfingerd/
 Source0:       
http://www.infodrom.org/projects/cfingerd/download/%{name}-%{version}.tar.gz
 # Source0-md5: fe9365f811624248aa3df52c4a832fc7
@@ -17,16 +16,17 @@
 Patch2:                %{name}-security_format_bug.patch
 Patch3:                %{name}-gpg.patch
 BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      inetdaemon
 Requires:      rc-inetd >= 0.8.1
 Provides:      fingerd
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     bsd-fingerd
 Obsoletes:     cfingerd-nobody
 Obsoletes:     cfingerd-noroot
 Obsoletes:     efingerd
 Obsoletes:     ffingerd
 Obsoletes:     finger-server
-Obsoletes:     bsd-fingerd
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 CFINGERD is a free finger daemon replacement for standard finger
@@ -69,15 +69,11 @@
 
 
 %post
-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
-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
 
 %clean
@@ -103,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.42  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 
@@ -243,7 +242,7 @@
 - added rc-inetd support
 
 Revision 1.2  1999/08/20 14:42:13  misiek
-config root read-only
+- config root read-only
 
 Revision 1.1  1999/08/18 13:29:57  misiek
-new spec
+- new spec

================================================================
Index: SPECS/cipe.spec
diff -u SPECS/cipe.spec:1.47 SPECS/cipe.spec:1.48
--- SPECS/cipe.spec:1.47        Tue Dec 13 20:13:49 2005
+++ SPECS/cipe.spec     Tue Mar 14 02:24:26 2006
@@ -3,11 +3,11 @@
 # Conditional build:
 %bcond_without dist_kernel     # without kernel from distribution
 #
+%define        _rel    1
 Summary:       CIPE - encrypted IP over UDP tunneling
 Summary(pl):   CIPE - szyfrowany tunel IP po UDP
 Name:          cipe
 Version:       1.5.4
-%define        _rel    1
 Release:       %{_rel}
 License:       GPL
 Group:         Networking/Daemons
@@ -26,7 +26,7 @@
 BuildRequires: automake
 %{?with_dist_kernel:BuildRequires:     kernel-headers}
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.118
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                __cc            %{kgcc}
@@ -47,8 +47,8 @@
 Summary:       The PKCIPE public key tool for CIPE
 Summary(pl):   PKCIPE - narzędzie do wykorzystania kluczy publicznych w CIPE
 Group:         Networking/Daemons
-Requires:      /usr/bin/openssl
 Requires:      %{name} = %{version}-%{release}
+Requires:      /usr/bin/openssl
 Obsoletes:     cipe-pkcipe
 
 %description pkcipe-client
@@ -213,15 +213,11 @@
 [ ! -f %{_sysconfdir}/cipe/identity.priv ] && %{_bindir}/rsa-keygen 
%{_sysconfdir}/cipe/identity
 
 %post pkcipe-server
-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 pkcipe-server
-if [ "$1" = "0" -a -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  -n kernel-cipe
@@ -268,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.47  2005/12/13 19:13:49  qboosh
 - new-style bcond, cosmetics
 

================================================================
Index: SPECS/comsat.spec
diff -u SPECS/comsat.spec:1.25 SPECS/comsat.spec:1.26
--- SPECS/comsat.spec:1.25      Thu Mar  9 15:35:10 2006
+++ SPECS/comsat.spec   Tue Mar 14 02:24:26 2006
@@ -15,11 +15,12 @@
 Source0:       
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/biff+%{name}-%{version}.tar.gz
 # Source0-md5: 0e366384b0ffc7d4f748713a6359e089
 Source1:       %{name}.inetd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      rc-inetd
 Provides:      biff
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     biff
 Obsoletes:     biff+comsat
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The biff client and comsat server are an antiquated method of
@@ -109,15 +110,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 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
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = 0 ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -133,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/03/14 01:24:26  glen
+- unified rc-inetd usage (via %service), adapterized
+
 Revision 1.25  2006/03/09 14:35:10  glen
 - quote %{__cc}
 

================================================================
Index: SPECS/cvs-nserver.spec
diff -u SPECS/cvs-nserver.spec:1.85 SPECS/cvs-nserver.spec:1.86
--- SPECS/cvs-nserver.spec:1.85 Mon May  2 20:23:51 2005
+++ SPECS/cvs-nserver.spec      Tue Mar 14 02:24:26 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - trigger for upgrade from old cvs - after that package stays without any
 #   users and nserver-common is not installed...
@@ -40,7 +39,7 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -124,14 +123,14 @@
 Summary:       Concurrent Versions System - common files
 Summary(pl):   Concurrent Versions System - wspólne pliki
 Group:         Development/Version Control
+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/useradd
 Requires(pre): cvs-nserver-client
 Requires(pre): fileutils
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
 Requires:      %{name}-client = %{version}-%{release}
 Provides:      group(cvs)
 Provides:      group(cvsadmin)
@@ -149,8 +148,8 @@
 Summary:       Concurrent Versions System - pserver
 Summary(pl):   Concurrent Versions System - pserver
 Group:         Development/Version Control
-PreReq:                rc-inetd
 Requires:      %{name}-common = %{version}-%{release}
+Requires:      rc-inetd
 Obsoletes:     cvs-npserver
 Obsoletes:     cvs-pserver
 
@@ -164,8 +163,8 @@
 Summary:       Concurrent Versions System - nserver
 Summary(pl):   Concurrent Versions System - nserver
 Group:         Development/Version Control
-PreReq:                rc-inetd
 Requires:      %{name}-common = %{version}-%{release}
+Requires:      rc-inetd
 Obsoletes:     cvs-nserver
 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amanda.spec?r1=1.136&r2=1.137&f=u
    http://cvs.pld-linux.org/SPECS/atftp.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/bftpd.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/bincimap.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/bootp.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/bsd-finger.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/SPECS/cfingerd.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/cipe.spec?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/SPECS/comsat.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/cvs-nserver.spec?r1=1.85&r2=1.86&f=u
    http://cvs.pld-linux.org/SPECS/cvs.spec?r1=1.164&r2=1.165&f=u
    http://cvs.pld-linux.org/SPECS/efingerd.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/ffingerd.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/SPECS/ftpd-BSD.spec?r1=1.69&r2=1.70&f=u
    http://cvs.pld-linux.org/SPECS/ftpproxy.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/glftpd.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/imap.spec?r1=1.95&r2=1.96&f=u
    http://cvs.pld-linux.org/SPECS/inetutils.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/intimed.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/leafnode+.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/leafnode.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/SPECS/linux-ftpd.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/midentd.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/miniserv.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/nidentd.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/noffle.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/ntalk.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/SPECS/pidentd.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/pop3proxy.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/popa3d.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/poppassd.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/rsh.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/rshproxy.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/sane-backends.spec?r1=1.109&r2=1.110&f=u
    http://cvs.pld-linux.org/SPECS/smtpproxy.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/solid-pop3d.spec?r1=1.79&r2=1.80&f=u
    http://cvs.pld-linux.org/SPECS/teapop.spec?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/SPECS/telnet.spec?r1=1.76&r2=1.77&f=u
    http://cvs.pld-linux.org/SPECS/tftp-hpa.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/tftp.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/SPECS/utftpd.spec?r1=1.69&r2=1.70&f=u
    http://cvs.pld-linux.org/SPECS/uucp.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/SPECS/wu-ftpd.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/zabbix.spec?r1=1.27&r2=1.28&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to