- upstart hook

Changed files:
    NetworkManager.spec -> 1.75
    upstart.patch -> 1.1

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 62e9f05b2c59d0fd0d6c69cc4466a4da204cba65..a9408c562e55ff50f49f67cd4cdfcefbe435aa67 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -3,7 +3,7 @@ Summary:        Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
 Version:       0.8.2
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Source0:      http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{ver
 Source1:       %{name}.conf
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-compile.patch
+Patch2:                upstart.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
@@ -37,7 +38,7 @@ Requires:     %{name}-libs = %{version}-%{release}
 Requires:      dhcp-client
 Requires:      filesystem >= 3.0-37
 Requires:      polkit
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.3.0
 Requires:      wpa_supplicant >= 0.6-2
 Suggests:      ModemManager
 Suggests:      mobile-broadband-provider-info
@@ -112,6 +113,7 @@ Statyczne biblioteki Network Managera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}

diff --git a/upstart.patch b/upstart.patch
new file mode 100644 (file)
index 0000000..5e92c82
--- /dev/null
+++ b/upstart.patch
@@ -0,0 +1,13 @@
+--- NetworkManager-0.8.2/initscript/PLD/NetworkManager.in~     2011-01-28 00:03:53.343355186 +0200
++++ NetworkManager-0.8.2/initscript/PLD/NetworkManager.in      2011-01-26 21:16:35.872966423 +0200
+@@ -49,8 +49,9 @@
+       fi
+ }
+ 
+-RETVAL=0
++upstart_controlled
+ 
++RETVAL=0
+ case "$1" in
+   start)
+       start