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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index bae5294..0c94a1d 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,19 +8,19 @@ 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.3.5
-Release:	2
+Version:	0.4.4.2
+Release:	1
 License:	GPL v2
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	599cf1c5a381265b513d33258fd2069d
-Patch0:		%{name}-svn.patch
+# 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
@@ -48,16 +48,18 @@ 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
@@ -109,7 +111,6 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %{__aclocal}
@@ -119,7 +120,7 @@ programcıklar içerir.
 %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
@@ -128,7 +129,7 @@ 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
@@ -136,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
@@ -160,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
@@ -171,9 +174,6 @@ 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
@@ -228,6 +228,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %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
@@ -242,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
@@ -250,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
@@ -331,7 +334,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %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
@@ -341,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?/*