- fixed my sed->awk modifications (now tested and work)

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 75aed899282345ed57bd97d8a5c9d45f9d369ef6..0cfbc4904a4dad02c9dc4a6d5ab6ab996fefd65c 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,25 +1,29 @@
-# $Id: rc-scripts.spec,v 1.127 2003-10-08 14:56:09 havner Exp $
+#
+# Conditional build:
+%bcond_without static  # link binaries with glib dynamically
+#
 Summary:       inittab and /etc/rc.d scripts
 Summary(de):   inittab und /etc/rc.d Scripts
 Summary(fr):   inittab et scripts /etc/rc.d
 Summary(pl):   inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr):   inittab ve /etc/rc.d dosyalarý
 Name:          rc-scripts
-Version:       0.4.0.2
-Release:       0.2
+Version:       0.4.0.6
+Release:       0.3
 License:       GPL
 Vendor:                PLD rc-scripts Team <pld-rc-scripts@pld-linux.org>
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 1b5e2d3a0cb8f699ed54321404f64cba
-URL:           http://cvs.pld-linux.org/rc-scripts/
-Patch0:                rc-scripts-sysfs.patch
+# Source0-md5: 23f3c0e5194a75d3717d9d22c38446e4
+Patch0:                %{name}-quotation-marks.patch
+URL:           http://svn.pld-linux.org/cgi-bin/svnview/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: glib-devel
-%{!?_without_static:BuildRequires:     glib-static}
+%{?with_static:BuildRequires:  glib-static}
 BuildRequires: popt-devel
+BuildRequires: pkgconfig
 Requires(post):        fileutils
 Requires:      /bin/awk
 Requires:      /bin/basename
@@ -28,7 +32,6 @@ Requires:     /bin/nice
 Requires:      /bin/ps
 Requires:      FHS >= 2.2-6
 Requires:      SysVinit
-Requires:      bdflush
 Requires:      e2fsprogs >= 1.15
 Requires:      fileutils
 Requires:      findutils
@@ -37,7 +40,7 @@ Requires:     grep
 Requires:      iproute2
 Requires:      mingetty
 Requires:      mktemp
-Requires:      modutils >= 2.1.121
+Requires:      module-init-tools
 Requires:      mount >= 2.10
 Requires:      net-tools
 Requires:      procps
@@ -83,7 +86,7 @@ programc
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
 %{__aclocal}
@@ -92,7 +95,7 @@ programc
 %configure \
        --with-localedir=%{localedir}
 %{__make} \
-       %{?_without_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
+       %{!?with_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -100,7 +103,7 @@ install -d $RPM_BUILD_ROOT/var/{run/netreport,log}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       %{?_without_static:ppp_watch_LDADD="-lglib" ppp_watch_DEPENDENCIES=}
+       %{!?with_static:ppp_watch_LDADD="-lglib" 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
@@ -203,6 +206,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 %attr(755,root,root) %{_bindir}/run-parts
 %attr(755,root,root) %{_bindir}/usleep
 
+%attr(755,root,root) %{_sbindir}/genhostid
 %attr(755,root,root) %{_sbindir}/hwprofile
 %attr(755,root,root) %{_sbindir}/service
 %attr(755,root,root) %{_sbindir}/consoletype