Author: glen Date: Mon Mar 6 18:14:42 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service, fix double restart; rel 3
---- Files affected: SPECS: oidentd.spec (1.57 -> 1.58) ---- Diffs: ================================================================ Index: SPECS/oidentd.spec diff -u SPECS/oidentd.spec:1.57 SPECS/oidentd.spec:1.58 --- SPECS/oidentd.spec:1.57 Thu Jan 12 16:05:03 2006 +++ SPECS/oidentd.spec Mon Mar 6 19:14:36 2006 @@ -3,7 +3,7 @@ Summary(pl): Serwer ident z obsługą maskowanych adresów IP Name: oidentd Version: 2.0.7 -Release: 2 +Release: 3 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/ojnk/%{name}-%{version}.tar.gz @@ -18,15 +18,16 @@ BuildRequires: automake BuildRequires: bison BuildRequires: flex +BuildRequires: rpmbuild(macros) >= 1.268 Requires: %{name}-init = %{version}-%{release} Provides: identserver -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: linux-identd Obsoletes: linux-identd-inetd Obsoletes: linux-identd-standalone Obsoletes: midentd Obsoletes: nidentd Obsoletes: pidentd +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Oidentd is an ident (rfc1413) daemon that runs on Linux, FreeBSD, @@ -53,7 +54,7 @@ Requires: %{name} = %{version}-%{release} Requires: rc-inetd Provides: %{name}-init = %{version}-%{release} -Obsoletes: %{name}-standalone +Obsoletes: oidentd-standalone Conflicts: %{name} <= 2.0.7-1 %description inetd @@ -70,7 +71,7 @@ Requires: %{name} = %{version}-%{release} Requires: rc-scripts Provides: %{name}-init = %{version}-%{release} -Obsoletes: %{name}-inetd +Obsoletes: oidentd-inetd Conflicts: %{name} <= 2.0.7-1 %description standalone @@ -107,30 +108,20 @@ %post standalone /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/oidentd ]; then - /etc/rc.d/init.d/oidentd restart 1>&2 -else - echo "Type \"/etc/rc.d/init.d/oidentd start\" to start inet server" 1>&2 -fi +%service oidentd restart %preun standalone if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/oidentd ]; then - /etc/rc.d/init.d/oidentd stop >&2 - fi + %service oidentd stop /sbin/chkconfig --del %{name} fi %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 %files @@ -157,6 +148,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58 2006/03/06 18:14:36 glen +- use %service, fix double restart; rel 3 + Revision 1.57 2006/01/12 15:05:03 adamg - strict internal deps ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/oidentd.spec?r1=1.57&r2=1.58&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
