- requires character classes support, in case of mawk introduced in 1.3.4 20090727...

[packages/rc-scripts.git] / rc-scripts.spec

diff --git a/rc-scripts.spec b/rc-scripts.spec
index b66d36f7c0a299cd10d9b144e2c803049e154b0d..7f13cce013e32a80f30ab2d20104953cb6df6d84 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,16 +8,17 @@ 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.14
-Release:       2
+Version:       0.4.15
+Release:       5
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 0ea644baf8597bedf67b47beb1994753
+# Source0-md5: 6acdba8a0df67f4cdbfcfd78a0512017
 Source1:       rc-local.service
 Source2:       sys-chroots.service
 Source3:       %{name}.tmpfiles
+Patch0:                %{name}-git.patch
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires: autoconf
 BuildRequires: automake
@@ -63,13 +64,15 @@ Requires:   mktemp
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2
-Requires:      util-linux
+Requires:      util-linux >= 2.22.1
 Requires:      virtual(module-tools)
 Suggests:      libcgroup
 Obsoletes:     initscripts
 Obsoletes:     vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
 Conflicts:     dev < 2.9.0-22
+# character classes support required
+Conflicts:     mawk < 1.3.4-0.20090727
 Conflicts:     iputils-arping < 2:s20070202-1
 Conflicts:     openssh-server < 2:3.6.1p2-6
 Conflicts:     psacct < 6.3.5-10
@@ -128,6 +131,7 @@ directories are silently ignored.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # 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"
@@ -147,6 +151,7 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
        $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
+       $RPM_BUILD_ROOT{%{_sysconfdir},%{_prefix}/lib}/sysctl.d \
        $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
@@ -342,6 +347,7 @@ done
 /lib/rc-scripts/ifup-routes
 %attr(755,root,root) /lib/rc-scripts/ifup-sl
 %attr(755,root,root) /lib/rc-scripts/ifup-vlan
+%attr(755,root,root) /lib/rc-scripts/makepid
 /lib/rc-scripts/functions.network
 /lib/rc-scripts/functions
 
@@ -382,6 +388,9 @@ done
 %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
 
+%dir %{_sysconfdir}/sysctl.d
+%dir %{_prefix}/lib/sysctl.d
+
 %{_mandir}/man?/*
 %lang(de) %{_mandir}/de/man?/*
 %lang(es) %{_mandir}/es/man?/*