X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=rc-scripts.spec;h=3995f8659c391e6ea96c9e05bf3c119af71f5240;hb=d60c5a937fe67669f939d44bc50eb8df26e51fc8;hp=c4e37b15203f56703bf0c4f5ce766e2611be4170;hpb=fbb18e1259fe686e4bdd2be7402c72ab6421eaf6;p=packages%2Frc-scripts.git

diff --git a/rc-scripts.spec b/rc-scripts.spec
index c4e37b1..3995f86 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,18 +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.4
-Release:	1
+Version:	0.4.5.1
+Release:	2
 License:	GPL v2
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	e04c74183b14ef4f7cf3242cf26b4e0a
-URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
+# Source0-md5:	00d0cbd7bb54c89fed07ebce20a4a0b7
+URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/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
@@ -47,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
@@ -73,6 +76,7 @@ Conflicts:	udev-core < 1:124-3
 %endif
 Conflicts:	upstart-SysVinit < 2.86-25
 Conflicts:	wpa_supplicant < 0.6.3
+Conflicts:	lvm2 < 2.02.83
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
@@ -109,6 +113,10 @@ programcıklar içerir.
 %prep
 %setup -q
 
+# hack, currently this results -lgcc_s not found error:
+#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
+
 %build
 %{__aclocal}
 %{__autoheader}
@@ -117,7 +125,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
@@ -126,7 +134,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
@@ -134,6 +142,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
@@ -158,6 +167,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
@@ -169,9 +179,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
@@ -201,7 +208,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%doc doc/*.txt rc.d/init.d/template.init
+%doc doc/*.txt doc/template.init
 %doc sysconfig/interfaces/data/chat-ppp*
 %doc sysconfig/interfaces/ifc*
 %doc sysconfig/interfaces/tnl*
@@ -212,20 +219,26 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %dir /etc/rc.d/init.d
 %dir /etc/rc.d/rc?.d
 /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/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
+%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS-sulogin.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
 
-/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
@@ -240,6 +253,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
@@ -248,6 +262,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
@@ -283,6 +298,29 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(4755,root,root) %{_sbindir}/usernetctl
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
+%dir /lib/rc-scripts
+%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
+%attr(755,root,root) /lib/rc-scripts/ifdown-ppp
+%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-br
+%attr(755,root,root) /lib/rc-scripts/ifup-ipx
+%attr(755,root,root) /lib/rc-scripts/ifup-irda
+%attr(755,root,root) /lib/rc-scripts/ifup-iucv
+/lib/rc-scripts/ifup-neigh
+%attr(755,root,root) /lib/rc-scripts/ifup-plip
+%attr(755,root,root) /lib/rc-scripts/ifup-plusb
+%attr(755,root,root) /lib/rc-scripts/ifup-post
+%attr(755,root,root) /lib/rc-scripts/ifup-ppp
+/lib/rc-scripts/ifup-routes
+%attr(755,root,root) /lib/rc-scripts/ifup-sl
+%attr(755,root,root) /lib/rc-scripts/ifup-vlan
+/lib/rc-scripts/functions.network
+/lib/rc-scripts/functions
+
 %dir %{_sysconfdir}/ppp
 %attr(754,root,root) %{_sysconfdir}/ppp/*
 %dir /etc/sysconfig/cpusets
@@ -291,28 +329,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %dir /etc/sysconfig/interfaces/data
 %dir /etc/sysconfig/isapnp
 
-%dir /etc/sysconfig/network-scripts
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-br
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-irda
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-post
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-ppp
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-sl
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-vlan
-/etc/sysconfig/network-scripts/ifup-aliases
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-br
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-ipx
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-irda
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-iucv
-/etc/sysconfig/network-scripts/ifup-neigh
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-plip
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-plusb
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-post
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-ppp
-/etc/sysconfig/network-scripts/ifup-routes
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-sl
-%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-vlan
-
-/etc/sysconfig/network-scripts/functions.network
 %dir /etc/sysconfig/interfaces/down.d
 %dir /etc/sysconfig/interfaces/down.d/*
 %dir /etc/sysconfig/interfaces/up.d
@@ -320,6 +336,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/down.d/ppp/logger
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/interfaces/up.d/ppp/logger
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/isapnp/isapnp-kernel.conf
+
 %attr(640,root,root) %ghost /var/log/dmesg
 %attr(750,root,root) %dir /var/run/netreport
 
@@ -329,7 +346,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
@@ -339,7 +355,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?/*