X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rc-scripts.spec;h=4e434d4141b4297e17aa53a60e7611009b1f291a;hb=8e620fef611f4edaedcdef927da7cfc32278946c;hp=92dc3a1a92c529a9c7b34e831695e3d2d0c3bd19;hpb=359f7c3006e45436d67ceb2df3f3d28915af4586;p=packages%2Frc-scripts.git

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 92dc3a1..4e434d4 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,31 +1,39 @@
 #
 # Conditional build:
 %bcond_without	static		# link binaries with glib dynamically
-#
+
 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.26
-Release:	3
+Version:	0.4.5.3
+Release:	8
 License:	GPL v2
 Group:		Base
-#Source0:	ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
+#Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	d4d44fd0c8003b19392ae0d9a90b8eb5
-Patch0:		%{name}-makepid.patch
-URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
+# Source0-md5:	ac04b9e70d2bb1583f5ea41dd2d1894e
+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
 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
@@ -33,24 +41,32 @@ Requires:	/bin/basename
 Requires:	/bin/gettext
 Requires:	/bin/nice
 Requires:	/bin/ps
-Requires:	SysVinit
+Requires:	virtual(init-daemon)
+Requires:	SysVinit-tools >= 2.88-1
 Requires:	blockdev
 Requires:	coreutils
+Requires:	ethtool
+%if "%{pld_release}" == "ac"
 Requires:	filesystem >= 3.0-11
+%else
+Requires:	filesystem >= 4.0-1
+%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
+Requires:	virtual(module-tools)
+Suggests:	libcgroup
 Provides:	initscripts
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
@@ -60,11 +76,13 @@ 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}" == "ti"
-Conflicts:	udev-core < 1:124-3
-%else
+%if "%{pld_release}" == "th"
 Conflicts:	udev-core < 1:135-2
+%else
+Conflicts:	udev-core < 1:124-3
 %endif
+Conflicts:	lvm2 < 2.02.83
+Conflicts:	upstart-SysVinit < 2.86-25
 Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -101,7 +119,12 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
+%patch1 -p0
+
+# 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
 
 %build
 %{__aclocal}
@@ -111,16 +134,17 @@ 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
-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/hwprofiles \
+	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__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
@@ -128,6 +152,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
@@ -152,6 +177,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
@@ -163,8 +189,15 @@ 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
+# 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
+
+%if "%{pld_release}" == "ac"
+rm -rf $RPM_BUILD_ROOT/etc/init
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -191,7 +224,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*
@@ -202,20 +235,35 @@ 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/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-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
 %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
+%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
@@ -223,6 +271,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
@@ -231,6 +280,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
@@ -248,7 +298,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
@@ -260,10 +309,41 @@ 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
+
+%{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
+%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
@@ -272,28 +352,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
@@ -301,6 +359,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
 
@@ -310,7 +369,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
@@ -320,7 +378,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?/*