- rel 6; disabling ipv6 dropped

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index c6047ec57a21e4ac58fd4becfd054d6a07292cdc..3133500fa3cd0ff925f12b95e65b8b02169b0b72 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,18 +8,21 @@ 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.7
-Release:       1
+Version:       0.4.4.1
+Release:       6
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5: 6f349b3c5e74e538e14eaab389625643
+# Source0-md5: ff522ac3a98dc6c8c0c891f91a164ec2
+Patch0:                %{name}-routes6.patch
+Patch1:                %{name}-svn.patch
 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
@@ -47,16 +50,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
@@ -108,6 +113,8 @@ programcıklar içerir.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
 
 %build
 %{__aclocal}
@@ -117,7 +124,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 +133,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
@@ -171,9 +178,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
@@ -334,7 +338,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
@@ -344,7 +347,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?/*