- release down to 1 for TLD

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 08ff0e5c5166ca7a4b08a6febb49b924dc9278f6..5e0437a395dbca29e179b1ae92b8794fed006a85 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,16 +7,20 @@ 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.1
-Release:       2
+Version:       0.4.5.3
+Release:       1
 License:       GPL v2
 Group:         Base
-#
-# Get sources using getrcscripts.sh, it does everything for you
-#
-Source0:       ftp://df.tld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5: c0d6d5b73e10db60fc748a79a584775f
+#Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
+# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e
+Source1:       rc-local.service
+Source2:       sys-chroots.service
+Source3:       %{name}.tmpfiles
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
+Patch0:                %{name}-skip_networkmanager_users_config.patch
+Patch1:                %{name}-svn.patch
+Patch100:      %{name}-tld.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -37,11 +41,12 @@ Requires:   /bin/basename
 Requires:      /bin/gettext
 Requires:      /bin/nice
 Requires:      /bin/ps
-Requires:      SysVinit
+Requires:      virtual(init-daemon)
+Requires:      SysVinit-tools >= 2.88-1
 Requires:      blockdev
 Requires:      coreutils
 Requires:      ethtool
-Requires:      filesystem >= 3.0-35
+Requires:      filesystem >= 4.0-1
 Requires:      findutils
 Requires:      fsck
 Requires:      gettext
@@ -51,12 +56,12 @@ Requires:   iproute2
 Requires:      iputils-arping
 Requires:      mingetty
 Requires:      mktemp
-Requires:      module-init-tools
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2
 Requires:      utempter
 Requires:      util-linux
+Requires:      virtual(module-tools)
 Suggests:      libcgroup
 Provides:      initscripts
 Obsoletes:     initscripts
@@ -67,7 +72,8 @@ Conflicts:    iputils-arping < 2:s20070202-1
 Conflicts:     openssh-server < 2:3.6.1p2-6
 Conflicts:     psacct < 6.3.5-10
 Conflicts:     tzdata < 2007b-1.1
-Conflicts:     udev-core < 1:124-3
+Conflicts:     udev-core < 1:135-2
+Conflicts:     lvm2 < 2.02.83
 Conflicts:     upstart-SysVinit < 2.86-25
 Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -105,10 +111,13 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
+%patch100 -p1
 
-# hack, currently this results -lgcc_s not found error:
+# hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
-sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a %{_prefix}/%{_lib}/librt.a"#' configure.ac
+sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' configure.ac
 
 %build
 %{__aclocal}
@@ -122,8 +131,9 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a %{_prefix
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/{run/netreport,log}
-install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles
+install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
+       $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \
+       $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -172,6 +182,12 @@ done
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
+# systemd
+install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service
+install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -210,6 +226,18 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 /etc/init.d
 /etc/rc.d/init.d/functions
 
+%config(noreplace) %verify(not md5 mtime size) /etc/init/allowlogin.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/cpusets.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/cryptsetup.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/local.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/modules.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/random.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/rc.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS-sulogin.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/sys-chroots.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/init/udev.conf
+
 %attr(754,root,root) /etc/rc.d/init.d/allowlogin
 %attr(754,root,root) /etc/rc.d/init.d/cpusets
 %attr(754,root,root) /etc/rc.d/init.d/cryptsetup
@@ -257,7 +285,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
-%attr(755,root,root) %{_sbindir}/fstab-decode
 %attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/getkey
 %attr(755,root,root) %{_sbindir}/hwprofile
@@ -273,8 +300,14 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_sbindir}/start-stop-daemon
 %attr(755,root,root) %{_sbindir}/tnl*
 %attr(4755,root,root) %{_sbindir}/usernetctl
+
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
+%{systemdtmpfilesdir}/rc-scripts.conf
+%{systemdunitdir}/local.service
+%{systemdunitdir}/rc-local.service
+%{systemdunitdir}/sys-chroots.service
+
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-br
 %attr(755,root,root) /lib/rc-scripts/ifdown-irda