- drop systemd stuff
authorMarcin Krol <hawk@tld-linux.org>
Thu, 30 Jul 2015 05:38:12 +0000 (05:38 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Thu, 30 Jul 2015 05:38:12 +0000 (05:38 +0000)
rpcbind.service [deleted file]
rpcbind.socket [deleted file]
rpcbind.spec

diff --git a/rpcbind.service b/rpcbind.service
deleted file mode 100644 (file)
index fab7898..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC bind service
-Requires=rpcbind.socket
-After=syslog.target network.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/rpcbind
-ExecStart=/sbin/rpcbind -w $RPCBIND_OPTIONS
-
-[Install]
-WantedBy=multi-user.target
-Also=rpcbind.socket
diff --git a/rpcbind.socket b/rpcbind.socket
deleted file mode 100644 (file)
index d63c1d9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPCbind Server Activation Socket
-
-[Socket]
-ListenStream=/var/run/rpcbind.sock
-
-[Install]
-WantedBy=sockets.target
index 760fa96770337a7365b02706bef10580a45da20f..779e9d2517060819decfd15575138dfed04616d9 100644 (file)
@@ -2,15 +2,13 @@ Summary:      Universal addresses to RPC program number mapper
 Summary(pl.UTF-8):     Demon odwzorowujący adresy uniwersalne na numery programów RPC
 Name:          rpcbind
 Version:       0.2.1
-Release:       4
+Release:       5
 License:       BSD
 Group:         Daemons
 Source0:       http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
 # Source0-md5: 0a5f9c2142af814c55d957aaab3bcc68
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
-Source3:       %{name}.service
-Source4:       %{name}.socket
 Patch0:                %{name}-libwrap.patch
 Patch1:                %{name}-syslog.patch
 Patch2:                %{name}-sunrpc.patch
@@ -26,10 +24,8 @@ BuildRequires:       libwrap-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.623
 Requires(post,preun):  /sbin/chkconfig
-Requires(post,preun,postun):   systemd-units >= 38
 Requires:      /sbin/chkconfig
 Requires:      rc-scripts >= 0.4.1.6
-Requires:      systemd-units >= 0.38
 Provides:      portmap = 8.0
 Provides:      user(rpc)
 Obsoletes:     portmap
@@ -73,7 +69,7 @@ wywołania RPC na serwerze na tej maszynie.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
-       $RPM_BUILD_ROOT{%{_mandir}/man8,%{_var}/lib/%{name},%{systemdunitdir}}
+       $RPM_BUILD_ROOT{%{_mandir}/man8,%{_var}/lib/%{name}}
 
 install rpcbind $RPM_BUILD_ROOT/sbin
 install rpcinfo $RPM_BUILD_ROOT%{_sbindir}
@@ -83,9 +79,6 @@ install man/{rpcbind,rpcinfo}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcbind
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rpcbind
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/rpcbind.service
-install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/rpcbind.socket
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,20 +88,17 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%systemd_preun rpcbind.service
 
 %triggerpostun -- %{name} < 0.2.0-5
 if [ -f /etc/sysconfig/rpcbind ]; then
@@ -124,7 +114,6 @@ if [ -f /etc/sysconfig/rpcbind ]; then
        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)
@@ -136,5 +125,3 @@ fi
 %{_mandir}/man8/rpcbind.8*
 %{_mandir}/man8/rpcinfo.8*
 %dir %attr(700,rpc,root) %{_var}/lib/%{name}
-%{systemdunitdir}/rpcbind.service
-%{systemdunitdir}/rpcbind.socket