[packages/NetworkManager] - drop upstart support - rel 2

baggins baggins at pld-linux.org
Tue Aug 18 15:31:26 CEST 2015


commit 9587977143bf2345f0f973549dc4824d2da88d9a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 18 22:30:57 2015 +0900

    - drop upstart support
    - rel 2

 NetworkManager.spec    | 7 +------
 NetworkManager.upstart | 7 -------
 2 files changed, 1 insertion(+), 13 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 834a47a..ab7bfe1 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,14 +8,13 @@ Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	1.0.4
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/%{name}-%{version}.tar.xz
 # Source0-md5:	7eabef7bd3bbdd6dc0473dd32aeac924
 Source1:	%{name}.conf
-Source2:	%{name}.upstart
 Source3:	%{name}.tmpfiles
 Source4:	%{name}.init
 Patch0:		ifcfg-path.patch
@@ -230,9 +229,6 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/NetworkManager.conf
-
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 # Cleanup
@@ -309,7 +305,6 @@ exit 0
 %attr(755,root,root) %{_libexecdir}/nm-iface-helper
 %attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%config(noreplace) %verify(not md5 mtime size) /etc/init/NetworkManager.conf
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-dispatcher.service
 %{systemdunitdir}/NetworkManager-wait-online.service
diff --git a/NetworkManager.upstart b/NetworkManager.upstart
deleted file mode 100644
index 04efa77..0000000
--- a/NetworkManager.upstart
+++ /dev/null
@@ -1,7 +0,0 @@
-description "NetworkManager daemon"
-
-start on pld.network-started and started SERVICE_syslog=y and started messagebus
-stop on pld.shutdown-started
-
-respawn
-exec /usr/sbin/NetworkManager --pid-file=/var/run/NetworkManager.pid --no-daemon
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/9587977143bf2345f0f973549dc4824d2da88d9a



More information about the pld-cvs-commit mailing list