- fix location of ifcfg files in ifcfg-rh plugin

Changed files:
    NetworkManager.spec -> 1.86
    ifcfg-path.patch -> 1.1

diff --git a/NetworkManager.spec b/NetworkManager.spec
index e124dbf2b0c3ebe17c1266d975518200cb16bc71..4de2b6bf8b47ee084bd0c30b958dc72717c50cde 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,7 +8,7 @@ Summary:        Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
 Version:       0.8.9997
-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
@@ -17,8 +17,9 @@ Group:                Networking/Admin
 Source0:       %{name}-%{version}-compat.tar.bz2
 # Source0-md5: 7a7fab2336c24b5cafa371782674fc06
 Source1:       %{name}.conf
-Source2:       NetworkManager.upstart
+Source2:       %{name}.upstart
 Patch0:                %{name}-pld.patch
+Patch1:                ifcfg-path.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -125,6 +126,7 @@ Statyczne biblioteki Network Managera.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -191,6 +193,10 @@ fi
 %service -q NetworkManagerDispatcher stop
 /sbin/chkconfig --del NetworkManagerDispatcher
 
+%triggerun -- NetworkManager < 0.8.9997-4
+# move network interfaces description files to new location
+mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 

diff --git a/ifcfg-path.patch b/ifcfg-path.patch
new file mode 100644 (file)
index 0000000..ae23c2a
--- /dev/null
+++ b/ifcfg-path.patch
@@ -0,0 +1,15 @@
+TODO: make it configurable via dist tag in configure.ac
+
+--- NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/common.h~    2011-05-31 10:37:37.000000000 +0300
++++ NetworkManager-0.8.9997/src/settings/plugins/ifcfg-rh/common.h     2011-08-19 11:07:06.325518503 +0300
+@@ -36,7 +36,9 @@
+ #define AUGNEW_TAG ".augnew"
+ #define AUGTMP_TAG ".augtmp"
+ 
+-#define IFCFG_DIR SYSCONFDIR"/sysconfig/network-scripts"
++#ifndef IFCFG_DIR
++#define IFCFG_DIR SYSCONFDIR"/sysconfig/interfaces"
++#endif
+ 
+ #define IFCFG_PLUGIN_NAME "ifcfg-rh"
+ #define IFCFG_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."