Author: glen Date: Sat Apr 29 11:04:53 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- merge %service and epoch fixes from HEAD
---- Files affected:
SPECS:
proftpd.spec (1.211.2.8 -> 1.211.2.9)
---- Diffs:
================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.8 SPECS/proftpd.spec:1.211.2.9
--- SPECS/proftpd.spec:1.211.2.8 Sat Apr 29 13:03:11 2006
+++ SPECS/proftpd.spec Sat Apr 29 13:04:48 2006
@@ -57,6 +57,7 @@
%{?with_pam:BuildRequires: pam-devel}
%{?with_quotapgsql:BuildRequires: postgresql-devel}
%{?with_quotapgsql:BuildRequires: postgresql-devel}
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/ftpd
@@ -306,38 +307,28 @@
cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
sed -i -e 's/^ServerType[[:space:]]\+standalone/ServerType
inetd/g' %{_sysconfdir}/proftpd.conf
fi
-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 [ "$1" = "0" ] && [ -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
%post standalone
-/sbin/chkconfig --add proftpd
if grep -iEqs "^ServerType[[:space:]]+inetd" %{_sysconfdir}/proftpd.conf ; then
cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
sed -i -e 's/^ServerType[[:space:]]\+inetd/ServerType
standalone/g' %{_sysconfdir}/proftpd.conf
fi
-if [ -f /var/lock/subsys/proftpd ]; then
- /etc/rc.d/init.d/proftpd restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/proftpd start\" to start ProFTPD daemon."
-fi
+/sbin/chkconfig --add proftpd
+%service proftpd restart "ProFTPD daemon"
%preun standalone
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/proftpd ]; then
- /etc/rc.d/init.d/proftpd stop 1>&2
- fi
+ %service proftpd stop
/sbin/chkconfig --del proftpd
fi
-%triggerpostun inetd -- %{name}-inetd <= 1.2.10-1
+%triggerpostun inetd -- %{name}-inetd <= 1:1.2.10
echo "Changing deprecated config options"
cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
sed -i -e '
@@ -354,7 +345,7 @@
/UseTCPD/d
' %{_sysconfdir}/proftpd.conf
-%triggerpostun standalone -- %{name}-standalone <= 1.2.10-1
+%triggerpostun standalone -- %{name}-standalone <= 1:1.2.10
echo "Changing deprecated config options"
cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
sed -i -e '
@@ -421,6 +412,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.211.2.9 2006/04/29 11:04:48 glen
+- merge %service and epoch fixes from HEAD
+
Revision 1.211.2.8 2006/04/29 11:03:11 glen
- cleanups, always enable DSO
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.8&r2=1.211.2.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
