X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts.spec;h=89ca1d943896deb44b6382e99bfcf4c8fe468013;hp=a36ee32c7df55f6e75b9f7b26fa3e348a963a47e;hb=0d5464140e41f7007628bedc3b345c037949d74e;hpb=1182a2a7befd3155b9b406279af95da97e2c16cc

diff --git a/rc-scripts.spec b/rc-scripts.spec
index a36ee32..89ca1d9 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,15 +7,16 @@ 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:	1
+Version:	0.4.6
+Release:	2
 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:	%{name}-%{version}.tar.gz
+# Source0-md5:	4340461fd2bdfd04b71ec926ca3bad71
+Source1:	rc-local.service
+Source2:	sys-chroots.service
+Source3:	%{name}.tmpfiles
+Patch100:	%{name}-tld.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -37,15 +38,12 @@ Requires:	/bin/basename
 Requires:	/bin/gettext
 Requires:	/bin/nice
 Requires:	/bin/ps
-Requires:	SysVinit
+Requires:	SysVinit-tools >= 2.88-1
 Requires:	blockdev
 Requires:	coreutils
 Requires:	ethtool
-%if "%{pld_release}" == "ac"
-Requires:	filesystem >= 3.0-11
-%else
-Requires:	filesystem >= 3.0-35
-%endif
+Requires:	virtual(init-daemon)
+Requires:	filesystem >= 4.0-1
 Requires:	findutils
 Requires:	fsck
 Requires:	gettext
@@ -55,14 +53,13 @@ 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
 Obsoletes:	vserver-rc-scripts
 Conflicts:	LPRng < 3.8.0-2
@@ -71,18 +68,16 @@ 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
-%if "%{pld_release}" == "th"
 Conflicts:	udev-core < 1:135-2
-%else
-Conflicts:	udev-core < 1:124-3
-%endif
+Conflicts:	lvm2 < 2.02.83
+Conflicts:	pdksh < 5.2.14-58
 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
@@ -113,10 +108,11 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%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 -lpthread"#' configure.ac
 
 %build
 %{__aclocal}
@@ -130,8 +126,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/{interfaces/data,hwprofiles} \
+	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -180,9 +177,14 @@ done
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
-%if "%{pld_release}" == "ac"
-rm -rf $RPM_BUILD_ROOT/etc/init
-%endif
+# 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -204,7 +206,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)
@@ -222,17 +234,17 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 /etc/init.d
 /etc/rc.d/init.d/functions
 
-%if "%{pld_release}" != "ac"
 %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.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
-%endif
 
 %attr(754,root,root) /etc/rc.d/init.d/allowlogin
 %attr(754,root,root) /etc/rc.d/init.d/cpusets
@@ -281,7 +293,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
@@ -297,8 +308,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