X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts.spec;h=abe17ea274b962c9552ebffae304ec4ed634d844;hp=5e0437a395dbca29e179b1ae92b8794fed006a85;hb=be10dac1baff45e310deaa5ef45bf8980cd57d23;hpb=1af3cb0e50f846d33259aed26589e4d074c85180

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 5e0437a..abe17ea 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.5.3
-Release:	1
+Version:	0.4.12
+Release:	5
 License:	GPL v2
 Group:		Base
-#Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	ac04b9e70d2bb1583f5ea41dd2d1894e
+# Source0-md5:	b52ca02678cb5f468972db06c6d032b0
 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
+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
@@ -41,11 +45,11 @@ Requires:	/bin/basename
 Requires:	/bin/gettext
 Requires:	/bin/nice
 Requires:	/bin/ps
-Requires:	virtual(init-daemon)
 Requires:	SysVinit-tools >= 2.88-1
 Requires:	blockdev
 Requires:	coreutils
 Requires:	ethtool
+Requires:	virtual(init-daemon)
 Requires:	filesystem >= 4.0-1
 Requires:	findutils
 Requires:	fsck
@@ -59,11 +63,10 @@ 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
-Provides:	initscripts
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
 Conflicts:	LPRng < 3.8.0-2
@@ -74,13 +77,14 @@ Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
 Conflicts:	udev-core < 1:135-2
 Conflicts:	lvm2 < 2.02.83
+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)
 
 %define		_exec_prefix	/
 %define		localedir	/etc/sysconfig/locale
-%define 	_bindir		/bin
+%define		_bindir		/bin
 %define		_sbindir	/sbin
 
 %description
@@ -111,13 +115,18 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 %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"
-sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' configure.ac
+sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpthread"#' configure.ac
 
 %build
 %{__aclocal}
@@ -132,7 +141,7 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' c
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
-	$RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \
+	$RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
 	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
@@ -188,6 +197,9 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,7 +220,17 @@ chown root:root /var/cache/rc-scripts/msg.cache
 
 # move network interfaces description files to new location
 %triggerpostun -- initscripts
-mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+[ -d /etc/sysconfig/network-scripts ] || exit 0
+cd /etc/sysconfig/network-scripts
+for iface in ifcfg-* ; do
+	[ -f $iface ] || continue
+	if [ -f /etc/sysconfig/interfaces/$iface ]; then
+		echo "/etc/sysconfig/interfaces/$iface renamed to /etc/sysconfig/interfaces/$iface.rpmnew"
+		mv -f /etc/sysconfig/interfaces/$iface{,.rpmnew}
+	fi
+	echo "/etc/sysconfig/network-scripts/$iface moved to /etc/sysconfig/interfaces/$iface"
+	mv -f /etc/sysconfig/network-scripts/$iface /etc/sysconfig/interfaces
+done
 
 %files
 %defattr(644,root,root,755)
@@ -282,6 +304,8 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %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
@@ -309,6 +333,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %{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
@@ -316,6 +341,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %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