- hwclock doesn't recognize -l (patch from devel-en)

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index f8b17ce6d27a9dc650b9fd03ef541e78443a1de6..7bf179ece2a35be5924b0aea628c97ebd2cf70ab 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_without static          # link binaries with glib dynamically
-%bcond_without devalias        # without dev_alias patch
 #
 Summary:       inittab and /etc/rc.d scripts
 Summary(de.UTF-8):     inittab und /etc/rc.d Scripts
@@ -9,26 +8,28 @@ 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.11
-Release:       1
+Version:       0.4.2.6
+Release:       3
 License:       GPL v2
 Group:         Base
-#Source0:      ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 8ee91ed141cfee6c00d387493b386bfd
-Patch0:                %{name}-dev_alias.patch
-Patch1:                %{name}-sleep.patch
-Patch2:                %{name}-fuser.patch
+Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
+# Source0-md5: 969442e0b04c3ff3ebb8f301f52fb879
+Patch0:                dropcaps.patch
+Patch1:                %{name}-modules.patch
+Patch2:                typo.patch
+Patch3:                rc.sysinit.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}
+BuildRequires: libcap-devel >= 2.17
+BuildRequires: linux-libc-headers >= 2.6.27
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 Requires(post):        fileutils
-%ifarch sparc sparc64
+%ifarch sparc sparcv9 sparc64
 Requires:      agetty
 %endif
 Requires:      /bin/awk
@@ -39,6 +40,7 @@ Requires:     /bin/ps
 Requires:      SysVinit
 Requires:      blockdev
 Requires:      coreutils
+Requires:      ethtool
 Requires:      filesystem >= 3.0-11
 Requires:      findutils
 Requires:      fsck
@@ -58,10 +60,17 @@ Provides:   initscripts
 Obsoletes:     initscripts
 Obsoletes:     vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
-Conflicts:     iputils-arping < 1:s20070202-1
+Conflicts:     dev < 2.9.0-22
+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
+Conflicts:     udev-core < 1:135-2
+%endif
+Conflicts:     wpa_supplicant < 0.6.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
@@ -97,14 +106,16 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%{?with_devalias:%patch0 -p0}
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
-%{__automake}
+%{__autoheader}
 %{__autoconf}
+%{__automake}
 %configure \
        --with-localedir=%{localedir}
 %{__make} \
@@ -113,6 +124,7 @@ 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
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -202,6 +214,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 /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/network
@@ -210,8 +223,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %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
-%attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/rc.modules
+%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
@@ -301,6 +313,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(750,root,root) %dir /var/run/netreport
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/crypttab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/initlog.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inittab
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modules