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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index bfab4be..4e434d4 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,13 +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.4.1
-Release:	1
+Version:	0.4.5.3
+Release:	8
 License:	GPL v2
 Group:		Base
-Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	ff522ac3a98dc6c8c0c891f91a164ec2
-URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
+#Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
+Source0:	%{name}-%{version}.tar.gz
+# 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
@@ -35,14 +41,15 @@ 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 >= 3.0-35
+Requires:	filesystem >= 4.0-1
 %endif
 Requires:	findutils
 Requires:	fsck
@@ -53,12 +60,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
@@ -73,6 +81,7 @@ 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)
@@ -110,6 +119,12 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%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}
@@ -123,8 +138,9 @@ programcıklar içerir.
 
 %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 \
@@ -173,8 +189,11 @@ 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
@@ -205,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*
@@ -216,15 +235,22 @@ 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
 
-/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
@@ -272,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
@@ -288,8 +313,37 @@ 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
+%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
@@ -298,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
@@ -327,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
 
@@ -345,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?/*