- 0.4.5.3

Changed files:
    rc-scripts-svn.patch -> 1.18
    rc-scripts.spec -> 1.386

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
deleted file mode 100644 (file)
index c8dc486..0000000
--- a/rc-scripts-svn.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- lib/functions      2011-12-14 13:23:27.000000000 +0200
-+++ lib/functions      2011-12-14 19:16:08.333233967 +0200
-@@ -643,7 +643,7 @@
-               nice=${nice:-0}
- 
-               # make nice level absolute, not to be dependant of nice level of shell where service started
--              nice=$((nice-$(nice)))
-+              nice=$(($nice - $(nice)))
- 
-               if [ "$closefds" = 1 ]; then
-                       exec 1>&-
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit    (wersja 12454)
-+++ rc.d/rc.sysinit    (kopia robocza)
-@@ -617,23 +617,26 @@
-               fi
-               if [ "$lvmversion" = "1" ] ; then
-                       modprobe -s lvm-mod >/dev/null 2>&1
-+                      lvmignorelocking=""
-                       lvmsysinit=""
-               elif [ "$lvmversion" = "2" ] ; then
-                       modprobe -s dm-mod >/dev/null 2>&1
-+                      lvmignorelocking="--ignorelockingfailure"
-                       lvmsysinit="--sysinit"
-               else
-                       modprobe -s lvm-mod >/dev/null 2>&1
-                       # device mapper (2.5+ and patched 2.4)
-                       modprobe -s dm-mod >/dev/null 2>&1
-+                      lvmignorelocking=""
-                       lvmsysinit=""
-               fi
- 
--              run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
-+              run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
-               run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
-               if [ "$lvmversion" = "2" ]; then
--                      /sbin/vgmknodes $lvmsysinit
-+                      /sbin/vgmknodes $lvmignorelocking
-                       # display VG statistics
--                      /sbin/vgdisplay -s $lvmsysinit
-+                      /sbin/vgdisplay -s $lvmignorelocking
-               fi
-       fi
- 
-@@ -732,7 +735,7 @@
-                       # LVM on RAID (keep in sync with LVM setting few lines above)
-                       if [ "$golvm" -eq "1" ]; then
-                               if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
--                                      run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
-+                                      run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
-                                       run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
-                                       [ "$lvmversion" = "2" ] && /sbin/vgmknodes
-                               fi

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 847a88fa90ed923d3ab3e82d8767a0ad83d27cda..75dd990919fd7659e8eb6ae3fcc883c84727cf34 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,19 +8,18 @@ Summary(fr.UTF-8):    inittab et scripts /etc/rc.d
 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:       6
+Version:       0.4.5.3
+Release:       1
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: bf27c7699c48598293e166eae364a5e0
+# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e
 Source1:       rc-scripts-systemd-tmpfiles.d.conf
 Source2:       rc-local.service
 Source3:       %{name}.tmpfiles
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
-Patch0:                %{name}-svn.patch
-Patch1:                %{name}-skip_networkmanager_users_config.patch
+Patch0:                %{name}-skip_networkmanager_users_config.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -119,8 +118,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
 
 # hack, currently this results -lgcc_s not found error:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"