Author: baggins Date: Sun Feb 5 16:44:44 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 5 - merge systemd stuff into main package
---- Files affected: packages/rpcbind: rpcbind.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: packages/rpcbind/rpcbind.spec diff -u packages/rpcbind/rpcbind.spec:1.21 packages/rpcbind/rpcbind.spec:1.22 --- packages/rpcbind/rpcbind.spec:1.21 Wed Jan 18 23:28:59 2012 +++ packages/rpcbind/rpcbind.spec Sun Feb 5 17:44:39 2012 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Demon odwzorowujący adresy uniwersalne na numery programów RPC Name: rpcbind Version: 0.2.0 -Release: 4 +Release: 5 License: GPL Group: Daemons Source0: http://dl.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Requires(post,preun): /sbin/chkconfig Requires: /sbin/chkconfig Requires: rc-scripts >= 0.4.1.6 +Requires: systemd-units >= 0.38 Provides: portmap = 8.0 Provides: user(rpc) Obsoletes: portmap @@ -49,20 +50,6 @@ adresy uniwersalne. Musi działać na maszynie, aby można było wykonywać wywołania RPC na serwerze na tej maszynie. -%package systemd -Summary: systemd units for rpcbind -Summary(pl.UTF-8): Jednostki systemd dla demona rpcbind -Group: Daemons -Requires: %{name} = %{version}-%{release} -Requires: systemd -Requires: systemd-units - -%description systemd -systemd units for rpcbind. - -%description systemd -l pl.UTF-8 -Jednostki systemd dla demona rpcbind. - %prep %setup -q %patch0 -p1 @@ -111,28 +98,22 @@ %post /sbin/chkconfig --add rpcbind %service rpcbind restart +%systemd_post rpcbind.service %postun if [ "$1" = "0" ]; then %userremove rpc fi +%systemd_reload %preun if [ "$1" = "0" ]; then %service -q rpcbind stop /sbin/chkconfig --del rpcbind fi - -%post systemd -%systemd_post rpcbind.service - -%preun systemd %systemd_preun rpcbind.service -%postun systemd -%systemd_reload - -%triggerpostun -- %{name} < 0.2.0-4 +%triggerpostun -- %{name} < 0.2.0-5 if [ -f /etc/sysconfig/rpcbind ]; then . /etc/sysconfig/rpcbind [ "$RPCBIND_VERBOSE" == "no" ] || RPCBIND_OPTIONS="-l" @@ -146,6 +127,7 @@ echo "# Added by rpm trigger" >>/etc/sysconfig/rpcbind echo "RPCBIND_OPTIONS=\"$RPCBIND_OPTIONS\"" >> /etc/sysconfig/rpcbind fi +%systemd_trigger rpcbind.service %files %defattr(644,root,root,755) @@ -156,9 +138,6 @@ %attr(755,root,root) %{_sbindir}/* %{_mandir}/man8/*.8* %dir %attr(700,rpc,root) %{_var}/lib/%{name} - -%files systemd -%defattr(644,root,root,755) %{systemdunitdir}/rpcbind.service %{systemdunitdir}/rpcbind.socket @@ -168,6 +147,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2012/02/05 16:44:39 baggins +- rel 5 +- merge systemd stuff into main package + Revision 1.21 2012/01/18 22:28:59 baggins - rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpcbind/rpcbind.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
