Author: glen Date: Sun Mar 5 15:20:20 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service, adapterized, cosmetics
---- Files affected:
SPECS:
nagios-nrpe.spec (1.22 -> 1.23) , nagios.spec (1.71 -> 1.72) , net-snmp.spec
(1.71 -> 1.72) , nfs-utils.spec (1.98 -> 1.99) , niceshaper.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SPECS/nagios-nrpe.spec
diff -u SPECS/nagios-nrpe.spec:1.22 SPECS/nagios-nrpe.spec:1.23
--- SPECS/nagios-nrpe.spec:1.22 Tue Feb 28 09:24:51 2006
+++ SPECS/nagios-nrpe.spec Sun Mar 5 16:20:15 2006
@@ -13,7 +13,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: openssl-tools
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,postun): /sbin/chkconfig
Requires: nagios-common
Requires: nagios-plugins
@@ -83,15 +83,11 @@
%post
/sbin/chkconfig --add nrpe
-if [ -f /var/lock/subsys/nrpe ]; then
- /etc/rc.d/init.d/nrpe restart 1>&2
-fi
+%service nrpe restart
%preun
if [ "$1" = "0" ] ; then
- if [ -f /var/lock/subsys/nrpe ]; then
- /etc/rc.d/init.d/nrpe stop 1>&2
- fi
+ %service nrpe stop
/sbin/chkconfig --del nrpe
fi
@@ -112,6 +108,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2006/03/05 15:20:15 glen
+- use %service, adapterized, cosmetics
+
Revision 1.22 2006/02/28 08:24:51 jajcus
- Version: 2.4
- compiled "--enable-command-args" for greater flexibility. This feature, when
================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.71 SPECS/nagios.spec:1.72
--- SPECS/nagios.spec:1.71 Thu Mar 2 14:17:28 2006
+++ SPECS/nagios.spec Sun Mar 5 16:20:15 2006
@@ -234,22 +234,18 @@
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} restart 1>&2
-fi
-
for i in
%{_localstatedir}/{objects.cache,{comments,downtime,retention,status}.dat}; do
[ ! -f $i ] && touch $i
chown root:nagios $i
chmod 664 $i
done
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
%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
@@ -276,7 +272,7 @@
%banner %{name} -e <<EOF
NOTE:
You need to add user to %{_webapps}/%{_webapp}/passwd and
-%{_webapps}/%{_webapp}/group to access nagios via web.
+%{_webapps}/%{_webapp}/group to access Nagios via web.
EOF
fi
@@ -466,6 +462,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2006/03/05 15:20:15 glen
+- use %service, adapterized, cosmetics
+
Revision 1.71 2006/03/02 13:17:28 jajcus
- Version: 2.0
================================================================
Index: SPECS/net-snmp.spec
diff -u SPECS/net-snmp.spec:1.71 SPECS/net-snmp.spec:1.72
--- SPECS/net-snmp.spec:1.71 Fri Jan 27 14:05:48 2006
+++ SPECS/net-snmp.spec Sun Mar 5 16:20:15 2006
@@ -47,15 +47,16 @@
BuildRequires: rpm-devel >= 4.0
BuildRequires: rpm-perlprov >= 3.0.3-16
BuildRequires: rpmbuild(macros) >= 1.176
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: /usr/bin/setsid
Requires: rc-scripts >= 0.2.0
Provides: snmpd
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: cmu-snmp
Obsoletes: snmpd
Obsoletes: ucd-snmp
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define logfile /var/log/snmpd.log
@@ -439,7 +440,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{snmp,rc.d/init.d,sysconfig},/var/log}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log}
%{__make} install \
INSTALL_PREFIX=$RPM_BUILD_ROOT
@@ -475,23 +476,14 @@
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/chkconfig --add snmpd
-if [ -f /var/lock/subsys/snmpd ]; then
- /etc/rc.d/init.d/snmpd restart >&2
-else
- %banner %{name} -e <<EOF
-Run \"/etc/rc.d/init.d/snmpd start\" to start snmpd daemon.
-EOF
-#" vim
-fi
touch %{logfile}
chmod 640 %{logfile}
+/sbin/chkconfig --add snmpd
+%service snmpd restart "snmpd daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/snmpd ]; then
- /etc/rc.d/init.d/snmpd stop >&2
- fi
+ %service snmpd stop
/sbin/chkconfig --del snmpd
fi
@@ -502,23 +494,14 @@
/sbin/chkconfig --add snmpd
%post snmptrapd
-/sbin/chkconfig --add snmptrapd
-if [ -f /var/lock/subsys/snmptrapd ]; then
- /etc/rc.d/init.d/snmptrapd restart >&2
-else
- %banner %{name}-snmptrapd -e <<EOF
-Run \"/etc/rc.d/init.d/snmptrapd start\" to start snmp trap daemon.
-EOF
-#" vim
-fi
touch %{logfile}
chmod 640 %{logfile}
+/sbin/chkconfig --add snmptrapd
+%service snmptrapd restart "snmp trap daemon"
%preun snmptrapd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/snmptrapd ]; then
- /etc/rc.d/init.d/snmptrapd stop >&2
- fi
+ %service snmptrapd stop
/sbin/chkconfig --del snmptrapd
fi
@@ -682,6 +665,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2006/03/05 15:20:15 glen
+- use %service, adapterized, cosmetics
+
Revision 1.71 2006/01/27 13:05:48 qboosh
- fixed snmptrapd trigger
================================================================
Index: SPECS/nfs-utils.spec
diff -u SPECS/nfs-utils.spec:1.98 SPECS/nfs-utils.spec:1.99
--- SPECS/nfs-utils.spec:1.98 Wed Nov 9 21:48:06 2005
+++ SPECS/nfs-utils.spec Sun Mar 5 16:20:15 2006
@@ -32,7 +32,7 @@
Patch3: %{name}-install.patch
Patch4: %{name}-nolibs.patch
Patch5: %{name}-usn36.patch
-Patch6:
http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.7-2/nfs-utils-1.0.7-CITI_NFS4_ALL-2.dif
+Patch6:
http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.7-2/%{name}-1.0.7-CITI_NFS4_ALL-2.dif
Patch7: %{name}-heimdal-internals.patch
Patch8: %{name}-rquotad-curblocks.patch
URL: http://nfs.sourceforge.net/
@@ -44,17 +44,17 @@
BuildRequires: nfsidmap-devel
%endif
BuildRequires: libwrap-devel
-PreReq: rc-scripts >= 0.4.0
-PreReq: setup >= 2.4.6-7
-Requires: %{name}-common = %{version}-%{release}
-Requires(post,preun): /sbin/chkconfig
Requires(post): fileutils
-Requires(post): sed
+Requires(post): sed >= 4.0
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
Requires: portmap >= 4.0
+Requires: rc-scripts >= 0.4.0
+Requires: setup >= 2.4.6-7
Provides: nfsdaemon
-Obsoletes: nfsdaemon
Obsoletes: knfsd
Obsoletes: nfs-server
+Obsoletes: nfsdaemon
Conflicts: kernel < 2.2.5
ExcludeArch: armv4l
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,15 +88,15 @@
Summary: Clients for connecting to a remote NFS server
Summary(pl): Klienci do łączenia się ze zdalnym serwerem NFS
Group: Networking
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
-Requires: psmisc
Requires: %{name}-common = %{version}-%{release}
-Provides: nfsclient
+Requires: psmisc
+Requires: rc-scripts
Provides: nfs-server-clients
-Obsoletes: nfsclient
-Obsoletes: nfs-server-clients
+Provides: nfsclient
Obsoletes: knfsd-clients
+Obsoletes: nfs-server-clients
+Obsoletes: nfsclient
%description clients
The nfs-server-clients package contains the showmount program.
@@ -116,13 +116,13 @@
Summary: Programs for NFS file locking
Summary(pl): Programy do obsługi blokowania plików poprzez NFS (lock)
Group: Networking
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
#Requires: kernel >= 2.2.5
Requires: portmap >= 4.0
+Requires: rc-scripts
Provides: nfslockd
-Obsoletes: nfslockd
Obsoletes: knfsd-lock
+Obsoletes: nfslockd
%description lock
The nfs-lock pacage contains programs which support the NFS file lock.
@@ -136,8 +136,8 @@
Summary: Remote quota server
Summary(pl): Zdalny serwer quota
Group: Networking/Daemons
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
Obsoletes: quota-rquotad
%description rquotad
@@ -205,7 +205,7 @@
%{__make} install \
install_prefix=$RPM_BUILD_ROOT
-install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT/etc
+install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
install tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
@@ -244,69 +244,43 @@
rm -rf $RPM_BUILD_ROOT
%post
+sed -i -e 's/NFSDTYPE=.*/NFSDTYPE=K/' /etc/sysconfig/nfsd
/sbin/chkconfig --add nfs
-if [ -r /var/lock/subsys/nfs ]; then
- /etc/rc.d/init.d/nfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfs start\" to start NFS daemon."
-fi
-umask 022
-sed -e 's/NFSDTYPE=.*/NFSDTYPE=K/' /etc/sysconfig/nfsd >
/etc/sysconfig/nfsd.new
-mv -f /etc/sysconfig/nfsd.new /etc/sysconfig/nfsd
+%service nfs restart "NFS daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfs ]; then
- /etc/rc.d/init.d/nfs stop >&2
- fi
+ %service nfs stop
/sbin/chkconfig --del nfs
fi
%post clients
/sbin/chkconfig --add nfsfs
-if [ -r /var/lock/subsys/nfsfs ]; then
- /etc/rc.d/init.d/nfsfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfsfs start\" to mount all NFS volumes."
-fi
+%service nfsfs restart
%preun clients
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfsfs ]; then
- /etc/rc.d/init.d/nfsfs stop >&2
- fi
+ %service nfsfs stop
/sbin/chkconfig --del nfsfs
fi
%post lock
/sbin/chkconfig --add nfslock
-if [ -r /var/lock/subsys/nfslock ]; then
- /etc/rc.d/init.d/nfslock restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/nfslock start\" to start nfslock daemon."
-fi
+%service nfslock restart "nfslock daemon"
%preun lock
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/nfslock ]; then
- /etc/rc.d/init.d/nfslock stop >&2
- fi
+ %service nfslock stop
/sbin/chkconfig --del nfslock
fi
%post rquotad
/sbin/chkconfig --add rquotad
-if [ -r /var/lock/subsys/rquotad ]; then
- /etc/rc.d/init.d/rquotad restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/rquotad start\" to start NFS quota daemon."
-fi
+%service rquotad restart "NFS quota daemon"
%preun rquotad
if [ "$1" = "0" ]; then
- if [ -r /var/lock/subsys/rquotad ]; then
- /etc/rc.d/init.d/rquotad stop >&2
- fi
+ %service rquotad stop
/sbin/chkconfig --del rquotad
fi
@@ -374,7 +348,6 @@
%{_mandir}/man8/gssd*
%endif
-
#%files rquotad
#%defattr(644,root,root,755)
#%attr(755,root,root) %{_sbindir}/rpc.rquotad
@@ -399,6 +372,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2006/03/05 15:20:15 glen
+- use %service, adapterized, cosmetics
+
Revision 1.98 2005/11/09 20:48:06 glen
- add todo: /proc/fs/nfsd is left mounted when package is erased
@@ -523,11 +499,11 @@
Revision 1.62 2003/07/14 16:56:59 misi3k
- rel 2
- added security patch
-BUG(redhat RHSA-2003:206-01):
-buffer overflow bug in nfs-utils version 1.0.3
-and earlier. This bug could be exploited by an attacker,
-causing a remote Denial of Service (crash).
-It is not believed that this bug could lead to remote arbitrary code execution.
+ BUG(redhat RHSA-2003:206-01):
+ buffer overflow bug in nfs-utils version 1.0.3
+ and earlier. This bug could be exploited by an attacker,
+ causing a remote Denial of Service (crash).
+ It is not believed that this bug could lead to remote arbitrary code
execution.
Revision 1.61 2003/06/13 10:17:17 misi3k
- Source0 cosmetics
@@ -560,9 +536,9 @@
- we don't want rquotad from this package - it sux0rz
Revision 1.52 2002/05/21 23:14:14 kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
+ s/^autoconf/\%\{__autoconf\}/"
Revision 1.51 2002/05/04 20:06:17 kloczek
- release 6,
@@ -576,15 +552,15 @@
Revision 1.49 2002/02/06 17:16:27 blues
- release 5
- fixed broken init script
-STB
+ STB
Revision 1.48 2002/01/25 22:19:31 blues
- release 4
- rebuild with corrected nfsfs init script
-STB
+ STB
Revision 1.47 2002/01/18 02:14:02 kloczek
-perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
+- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
Revision 1.46 2001/12/24 23:11:22 qboosh
- added lock checking in nfslock and rquotad init scripts
@@ -635,7 +611,7 @@
- new Source url.
Revision 1.32 2001/03/10 21:11:43 misiek
-time patch
+- time patch
Revision 1.31 2001/02/01 16:27:34 kloczek
- Requires for rc-scripts changed to Prereq.
@@ -676,7 +652,7 @@
- added "Obsoletes: quota-rquotad" in rquotad subpackage.
Revision 1.20 2000/06/09 07:23:26 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.19 2000/06/07 04:12:15 kloczek
- spec adapterized.
================================================================
Index: SPECS/niceshaper.spec
diff -u SPECS/niceshaper.spec:1.21 SPECS/niceshaper.spec:1.22
--- SPECS/niceshaper.spec:1.21 Tue Jan 10 11:52:09 2006
+++ SPECS/niceshaper.spec Sun Mar 5 16:20:15 2006
@@ -14,6 +14,7 @@
Source4: %{name}.init
URL: http://www.niceshaper.mikule.net/
BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
Requires: firewall-userspace-tool
Requires: rc-scripts
@@ -51,17 +52,11 @@
%post
/sbin/chkconfig --add niceshaper
-if [ -f /var/run/niceshaper.pid ]; then
- /etc/rc.d/init.d/niceshaper restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/niceshaper start\" to start niceshaper
daemon." >&2
-fi
+%service niceshaper restart "niceshaper daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/run/niceshaper.pid ]; then
- /etc/rc.d/init.d/niceshaper stop >&2
- fi
+ %service niceshaper stop
/sbin/chkconfig --del niceshaper
fi
@@ -69,7 +64,7 @@
%defattr(644,root,root,755)
%doc users config about
%dir %{_sysconfdir}/%{name}
-%attr(640,root,root) %verify(not size md5 mtime) %config(noreplace)
%{_sysconfdir}/%{name}/*
+%attr(640,root,root) %verify(not md5 mtime size) %config(noreplace)
%{_sysconfdir}/%{name}/*
%attr(755,root,root) %{_bindir}/*
%attr(754,root,root) %{_initrddir}/niceshaper
@@ -79,6 +74,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2006/03/05 15:20:15 glen
+- use %service, adapterized, cosmetics
+
Revision 1.21 2006/01/10 10:52:09 wolvverine
- add to pl description
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nagios-nrpe.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.71&r2=1.72&f=u
http://cvs.pld-linux.org/SPECS/net-snmp.spec?r1=1.71&r2=1.72&f=u
http://cvs.pld-linux.org/SPECS/nfs-utils.spec?r1=1.98&r2=1.99&f=u
http://cvs.pld-linux.org/SPECS/niceshaper.spec?r1=1.21&r2=1.22&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
