X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rc-scripts.spec;h=0c94a1da15176c437e91b7569f85da4ab4551508;hb=7fc281e99673ddbc532447eafec605c0dd278ac6;hp=f824e2d8347cb47437ad5d99c6b66c8597e289da;hpb=32d38f59360f4b0b2cfaee06d2251e70895a6a7e;p=packages%2Frc-scripts.git

diff --git a/rc-scripts.spec b/rc-scripts.spec
index f824e2d..0c94a1d 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,34 +1,33 @@
 #
 # Conditional build:
 %bcond_without	static		# link binaries with glib dynamically
-%bcond_without	devalias 	# without dev_alias patch
-#
+
 Summary:	inittab and /etc/rc.d scripts
 Summary(de.UTF-8):	inittab und /etc/rc.d Scripts
 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.1.12
+Version:	0.4.4.2
 Release:	1
 License:	GPL v2
 Group:		Base
-#Source0:	ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	8ee91ed141cfee6c00d387493b386bfd
-Patch0:		%{name}-dev_alias.patch
-Patch1:		%{name}-sleep.patch
-Patch2:		%{name}-fuser.patch
+Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
+# Source0-md5:	6e62fd462f8cdfe1e72957ee504a6ee6
 URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
 %{?with_static:BuildRequires:	glib2-static}
+%{?with_static:BuildRequires:	glibc-static}
+BuildRequires:	libcap-devel >= 1:2.17
+BuildRequires:	linux-libc-headers >= 7:2.6.27
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
+BuildRequires:	rpm >= 4.4.9-56
 Requires(post):	fileutils
-%ifarch sparc sparc64
+%ifarch sparc sparcv9 sparc64
 Requires:	agetty
 %endif
 Requires:	/bin/awk
@@ -39,29 +38,44 @@ Requires:	/bin/ps
 Requires:	SysVinit
 Requires:	blockdev
 Requires:	coreutils
+Requires:	ethtool
+%if "%{pld_release}" == "ac"
 Requires:	filesystem >= 3.0-11
+%else
+Requires:	filesystem >= 3.0-35
+%endif
 Requires:	findutils
 Requires:	fsck
 Requires:	gettext
 Requires:	grep
+Requires:	hostname
 Requires:	iproute2
+Requires:	iputils-arping
 Requires:	mingetty
 Requires:	mktemp
 Requires:	module-init-tools
 Requires:	mount >= 2.12
-Requires:	net-tools
 Requires:	procps >= 1:3.2.6-1.1
 Requires:	psmisc >= 22.5-2
 Requires:	utempter
 Requires:	util-linux
+Suggests:	libcgroup
 Provides:	initscripts
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
 Conflicts:	LPRng < 3.8.0-2
-Conflicts:	iputils-arping < 1:s20070202-1
+Conflicts:	dev < 2.9.0-22
+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:	upstart-SysVinit < 2.86-25
+Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
@@ -97,26 +111,25 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%{?with_devalias:%patch0 -p0}
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
-%{__automake}
+%{__autoheader}
 %{__autoconf}
+%{__automake}
 %configure \
 	--with-localedir=%{localedir}
 %{__make} \
-	%{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=}
+	%{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log}
+install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	%{!?with_static:ppp_watch_LDADD="-lglib-2.0" ppp_watch_DEPENDENCIES=}
+	%{!?with_static:ppp_watch_LDADD="$(pkg-config --libs glib-2.0)" ppp_watch_DEPENDENCIES=}
 
 for i in 0 1 2 3 4 5 6; do
 	install -d $RPM_BUILD_ROOT/etc/rc.d/rc$i.d
@@ -124,6 +137,7 @@ done
 
 for i in 2 3 4 5; do
 	ln -s ../init.d/local $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99local
+	ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S25netfs
 	ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S10network
 	ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99allowlogin
 	ln -s ../init.d/sys-chroots $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99sys-chroots
@@ -148,6 +162,7 @@ for i in 0 6; do
 done
 
 for i in 0 1 6; do
+	ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K75netfs
 	ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90network
 	ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01allowlogin
 	ln -s ../init.d/sys-chroots $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01sys-chroots
@@ -159,8 +174,9 @@ done
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
-# in static-routes can be also rules:
-ln -s static-routes $RPM_BUILD_ROOT/etc/sysconfig/static-rules
+%if "%{pld_release}" == "ac"
+rm -rf $RPM_BUILD_ROOT/etc/init
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -199,19 +215,27 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %dir /etc/rc.d/rc?.d
 /etc/init.d
 
+%if "%{pld_release}" != "ac"
+%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
+%endif
+
 /etc/rc.d/init.d/functions
 %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
 %attr(754,root,root) /etc/rc.d/init.d/killall
 %attr(754,root,root) /etc/rc.d/init.d/local
+%attr(754,root,root) /etc/rc.d/init.d/netfs
 %attr(754,root,root) /etc/rc.d/init.d/network
 %attr(754,root,root) /etc/rc.d/init.d/random
 %attr(754,root,root) /etc/rc.d/init.d/single
 %attr(754,root,root) /etc/rc.d/init.d/sys-chroots
 
 %attr(754,root,root) /etc/rc.d/rc
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/rc.local
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/rc.modules
+%config(noreplace) %verify(not md5 mtime size) /etc/rc.d/rc.local
 %attr(754,root,root) /etc/rc.d/rc.init
 %attr(754,root,root) /etc/rc.d/rc.sysinit
 %attr(754,root,root) /etc/rc.d/rc.shutdown
@@ -219,6 +243,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets
 %attr(754,root,root) /etc/rc.d/rc?.d/K??killall
 %attr(754,root,root) /etc/rc.d/rc?.d/K??local
+%attr(754,root,root) /etc/rc.d/rc?.d/K??netfs
 %attr(754,root,root) /etc/rc.d/rc?.d/K??network
 %attr(754,root,root) /etc/rc.d/rc?.d/K??random
 %attr(754,root,root) /etc/rc.d/rc?.d/K??single
@@ -227,6 +252,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets
 %attr(754,root,root) /etc/rc.d/rc?.d/S??killall
 %attr(754,root,root) /etc/rc.d/rc?.d/S??local
+%attr(754,root,root) /etc/rc.d/rc?.d/S??netfs
 %attr(754,root,root) /etc/rc.d/rc?.d/S??network
 %attr(754,root,root) /etc/rc.d/rc?.d/S??random
 %attr(754,root,root) /etc/rc.d/rc?.d/S??single
@@ -256,9 +282,11 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_sbindir}/ppp-watch
 %attr(755,root,root) %{_sbindir}/service
 %attr(755,root,root) %{_sbindir}/setsysfont
+%attr(755,root,root) %{_sbindir}/setuidgid
 %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
 
 %dir %{_sysconfdir}/ppp
 %attr(754,root,root) %{_sysconfdir}/ppp/*
@@ -301,11 +329,11 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(750,root,root) %dir /var/run/netreport
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/crypttab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/initlog.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inittab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysctl.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clock
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cpusets/cpuset-test
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hwprof
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/i18n
@@ -315,7 +343,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-arp
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-nat
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/sysconfig/static-rules
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system
 
 %{_mandir}/man?/*