- rel 4; add skip_networkmanager_users_config.patch

Changed files:
    rc-scripts-skip_networkmanager_users_config.patch -> 1.1
    rc-scripts.spec -> 1.382

diff --git a/rc-scripts-skip_networkmanager_users_config.patch b/rc-scripts-skip_networkmanager_users_config.patch
new file mode 100644 (file)
index 0000000..e81710b
--- /dev/null
+++ b/rc-scripts-skip_networkmanager_users_config.patch
@@ -0,0 +1,62 @@
+--- rc-scripts-0.4.5.2/rc.d/init.d/network.orig        2011-12-14 12:23:30.000000000 +0100
++++ rc-scripts-0.4.5.2/rc.d/init.d/network     2012-01-25 10:37:12.670299072 +0100
+@@ -135,7 +135,8 @@
+                               case $i in
+                                       *ifcfg-lo) continue ;;
+                               esac
+-                              ONBOOT=""; . "$i" 2>/dev/null
++                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                              [ ${USERS:-no} != no ] && continue
+                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+                       done
+               `
+@@ -145,7 +146,8 @@
+                               case ${i##*/} in
+                                       ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;;
+                               esac
+-                              ONBOOT=""; . "$i" 2>/dev/null
++                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                              [ ${USERS:-no} != no ] && continue
+                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+                       done
+               `
+@@ -156,7 +158,8 @@
+                                       ifcfg-*.*) ;;
+                                       *) continue ;;
+                               esac
+-                              ONBOOT=""; . "$i" 2>/dev/null
++                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                              [ ${USERS:-no} != no ] && continue
+                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+                       done
+               `
+@@ -167,7 +170,8 @@
+                                       ifcfg-br*) ;;
+                                       *) continue ;;
+                               esac
+-                              ONBOOT=""; . "$i" 2>/dev/null
++                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                              [ ${USERS:-no} != no ] && continue
+                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+                       done
+               `
+@@ -178,7 +182,8 @@
+                                       ifcfg-sit*) ;;
+                                       *) continue ;;
+                               esac
+-                              ONBOOT=""; . "$i" 2>/dev/null
++                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                              [ ${USERS:-no} != no ] && continue
+                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
+                       done
+               `
+@@ -186,7 +191,8 @@
+ 
+       tunnels=$(
+               for i in $(network_interface_configs 'tnlcfg-*'); do
+-                      ONBOOT=""; . "$i" 2>/dev/null
++                      ONBOOT=""; USERS=""; . "$i" 2>/dev/null
++                      [ ${USERS:-no} != no ] && continue
+                       [ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}"
+               done
+       )

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 5862ece6e07891f210a34286a59df12b7fb36cad..04907fee752d5d89eee907f13f41a84950104b92 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
 Version:       0.4.5.2
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@ Source1:      rc-scripts-systemd-tmpfiles.d.conf
 Source2:       rc-local.service
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 Patch0:                %{name}-svn.patch
+Patch1:                %{name}-skip_networkmanager_users_config.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -118,6 +119,7 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"