X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts.spec;h=cdf9140447e861f2836b1914d72550959b50209e;hp=b7031d5e2aa2872dbd373f8893e5eeefdc68e048;hb=4b0099f11bd86ec7b2f2011d78c4a6fe4b3a702e;hpb=e6bbe337ae126f62a12f0ee8294b66c1a71b9400

diff --git a/rc-scripts.spec b/rc-scripts.spec
index b7031d5..cdf9140 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,25 +7,17 @@ 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.12
+Version:	0.5.1
 Release:	2
 License:	GPL v2
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	b52ca02678cb5f468972db06c6d032b0
-Source1:	rc-local.service
-Source2:	sys-chroots.service
-Source3:	%{name}.tmpfiles
-Patch100:	%{name}-tld.patch
-Patch101:	%{name}-no_tmpfs_root_fsck.patch
-Patch102:	%{name}-selinuxfs_mount.patch
-Patch103:	%{name}-sh_fixes.patch
-Patch104:	%{name}-net-bond.patch
-Patch105:	%{name}-net-br.patch
+# Source0-md5:	052d832421951936b6b1e9da4e0513aa
+Patch0:		misc_fixes.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel
 %{?with_static:BuildRequires:	glib2-static}
 %{?with_static:BuildRequires:	glibc-static}
@@ -35,9 +27,6 @@ BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	rpm >= 4.4.9-56
 Requires(post):	fileutils
-%ifarch sparc sparcv9 sparc64
-Requires:	agetty
-%endif
 Requires:	/bin/awk
 Requires:	/bin/basename
 Requires:	/bin/gettext
@@ -113,12 +102,7 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
+%patch0 -p1
 
 # 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"
@@ -137,8 +121,7 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
-	$RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
-	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
+	$RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -187,12 +170,6 @@ 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
-
 # packaged into SysVinit and systemd-init (supported options differ)
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
 
@@ -244,18 +221,6 @@ done
 /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
@@ -323,11 +288,6 @@ done
 
 %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-bond
 %attr(755,root,root) /lib/rc-scripts/ifdown-br
@@ -350,6 +310,7 @@ done
 /lib/rc-scripts/ifup-routes
 %attr(755,root,root) /lib/rc-scripts/ifup-sl
 %attr(755,root,root) /lib/rc-scripts/ifup-vlan
+%attr(755,root,root) /lib/rc-scripts/makepid
 /lib/rc-scripts/functions.network
 /lib/rc-scripts/functions