Author: glen Date: Fri Aug 19 08:11:24 2011 GMT Module: packages Tag: HEAD ---- Log message: - fix location of ifcfg files in ifcfg-rh plugin
---- Files affected: packages/NetworkManager: NetworkManager.spec (1.85 -> 1.86) , ifcfg-path.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager.spec diff -u packages/NetworkManager/NetworkManager.spec:1.85 packages/NetworkManager/NetworkManager.spec:1.86 --- packages/NetworkManager/NetworkManager.spec:1.85 Mon Aug 15 17:36:26 2011 +++ packages/NetworkManager/NetworkManager.spec Fri Aug 19 10:11:19 2011 @@ -9,7 +9,7 @@ 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 @@ -18,8 +18,9 @@ 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 @@ -126,6 +127,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__gtkdocize} @@ -192,6 +194,10 @@ %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 @@ -277,6 +283,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.86 2011/08/19 08:11:19 glen +- fix location of ifcfg files in ifcfg-rh plugin + Revision 1.85 2011/08/15 15:36:26 glen - SERVICE_syslog=y in upstart ================================================================ Index: packages/NetworkManager/ifcfg-path.patch diff -u /dev/null packages/NetworkManager/ifcfg-path.patch:1.1 --- /dev/null Fri Aug 19 10:11:24 2011 +++ packages/NetworkManager/ifcfg-path.patch Fri Aug 19 10:11:19 2011 @@ -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." ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.85&r2=1.86&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
