X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rc-scripts.spec;h=ae4a0f2883e6ccf2b3daa0785272eb1936d56721;hb=e2bf0309756b52584fc99abe1e1d032368eb5611;hp=89ca1d943896deb44b6382e99bfcf4c8fe468013;hpb=ee5c092cdc89be5c3beddf1142db615ceb51bcb7;p=packages%2Frc-scripts.git

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 89ca1d9..ae4a0f2 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,20 +7,24 @@ 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.6
-Release:	2
+Version:	0.4.13
+Release:	1
 License:	GPL v2
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	4340461fd2bdfd04b71ec926ca3bad71
-Source1:	rc-local.service
-Source2:	sys-chroots.service
-Source3:	%{name}.tmpfiles
+# Source0-md5:	7df99aa887070a0d83a0daa28bf7deb9
 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
+Patch106:	%{name}-raid_lvm.patch
+Patch107:	%{name}-misc.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}
@@ -56,7 +60,7 @@ Requires:	mktemp
 Requires:	mount >= 2.12
 Requires:	procps >= 1:3.2.6-1.1
 Requires:	psmisc >= 22.5-2
-Requires:	utempter
+Requires:	libutempter >= 1.1.6-2
 Requires:	util-linux
 Requires:	virtual(module-tools)
 Suggests:	libcgroup
@@ -70,7 +74,7 @@ Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
 Conflicts:	udev-core < 1:135-2
 Conflicts:	lvm2 < 2.02.83
-Conflicts:	pdksh < 5.2.14-58
+Conflicts:	SysVinit < 2.88-16
 Conflicts:	upstart-SysVinit < 2.86-25
 Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -109,6 +113,13 @@ programcıklar içerir.
 %prep
 %setup -q
 %patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -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"
@@ -127,8 +138,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 \
@@ -177,12 +187,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
 
@@ -290,6 +294,8 @@ done
 %attr(755,root,root) %{_bindir}/ipcalc
 %attr(755,root,root) %{_bindir}/resolvesymlink
 %attr(755,root,root) %{_bindir}/run-parts
+# deprecated shell version, packaged for quick fix if something broken. will be dropped soon
+%attr(755,root,root) %{_bindir}/run-parts.sh
 %attr(755,root,root) %{_bindir}/usleep
 
 %attr(755,root,root) %{_sbindir}/consoletype
@@ -311,12 +317,8 @@ 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
 %attr(755,root,root) /lib/rc-scripts/ifdown-irda
 %attr(755,root,root) /lib/rc-scripts/ifdown-post
@@ -324,6 +326,7 @@ done
 %attr(755,root,root) /lib/rc-scripts/ifdown-sl
 %attr(755,root,root) /lib/rc-scripts/ifdown-vlan
 /lib/rc-scripts/ifup-aliases
+%attr(755,root,root) /lib/rc-scripts/ifup-bond
 %attr(755,root,root) /lib/rc-scripts/ifup-br
 %attr(755,root,root) /lib/rc-scripts/ifup-ipx
 %attr(755,root,root) /lib/rc-scripts/ifup-irda