initscript moved to rc-scripts

Changed files:
    SysVinit.spec -> 1.25
    sysvinit-paths.patch -> 1.3

diff --git a/SysVinit.spec b/SysVinit.spec
index 73a714a6ccc0c214d9b88983a26b46de51127410..550d6156d9fa4641d7e3fc90389f5fda6f228481 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -10,8 +10,7 @@ Copyright:    GPL
 Group:         Base
 Group(pl):     Podstawowe
 Source0:       ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
-Source1:       sysvinit-initscript
-Source2:       sysvinit.logrotate
+Source1:       sysvinit.logrotate
 Patch0:                sysvinit-paths.patch
 Patch1:                sysvinit-man.patch
 Patch2:                sysvinit-bequiet.patch
@@ -65,8 +64,7 @@ make install -C src \
        BIN_OWNER=`id -u` \
        BIN_GROUP=`id -g`
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/initscript
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/sysvinit
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/sysvinit
 
 ln -sf ../var/run/initrunlvl $RPM_BUILD_ROOT/etc
 ln -sf killall5 $RPM_BUILD_ROOT%{_sbindir}/pidof

diff --git a/sysvinit-paths.patch b/sysvinit-paths.patch
index 47f7ac1214651553f371e081cc8c32aa20882f58..3bad373dd1338eba7add2a94103668d4754fa627 100644 (file)
--- a/sysvinit-paths.patch
+++ b/sysvinit-paths.patch
@@ -65,7 +65,7 @@ diff -Nur sysvinit-2.76/src/paths.h sysvinit-2.76.pld/src/paths.h
  #define IOSAVE                "/etc/ioctl.save"       /* termios settings for SU */
  #define SHELL         "/bin/sh"               /* Default shell */
 -#define INITSCRIPT    "/etc/initscript"       /* Initscript. */
-+#define INITSCRIPT    "/etc/sysconfig/initscript"     /* Initscript. */
++#define INITSCRIPT    "/etc/rc.d/initscript"  /* Initscript. */
  #if 0
  #define HALTSCRIPT1   "/etc/init.d/halt"      /* Called by "fast" shutdown */
  #define HALTSCRIPT2   "/etc/rc.d/rc.0"        /* Called by "fast" shutdown */