Author: glen Date: Thu Sep 23 20:03:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- disable upstart on ac
---- Files affected:
packages/rc-scripts:
rc-scripts.spec (1.331 -> 1.332)
---- Diffs:
================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.331
packages/rc-scripts/rc-scripts.spec:1.332
--- packages/rc-scripts/rc-scripts.spec:1.331 Fri Jun 18 08:35:59 2010
+++ packages/rc-scripts/rc-scripts.spec Thu Sep 23 22:03:45 2010
@@ -2,7 +2,7 @@
#
# Conditional build:
%bcond_without static # link binaries with glib dynamically
-#
+
Summary: inittab and /etc/rc.d scripts
Summary(de.UTF-8): inittab und /etc/rc.d Scripts
Summary(fr.UTF-8): inittab et scripts /etc/rc.d
@@ -26,6 +26,7 @@
BuildRequires: linux-libc-headers >= 7:2.6.27
BuildRequires: pkgconfig
BuildRequires: popt-devel
+BuildRequires: rpm >= 4.4.9-56
Requires(post): fileutils
%ifarch sparc sparcv9 sparc64
Requires: agetty
@@ -39,7 +40,11 @@
Requires: blockdev
Requires: coreutils
Requires: ethtool
+%if "%{pld_release}" == "ac"
+Requires: filesystem >= 3.0-11
+%else
Requires: filesystem >= 3.0-35
+%endif
Requires: findutils
Requires: fsck
Requires: gettext
@@ -170,6 +175,10 @@
# 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
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -207,10 +216,12 @@
%dir /etc/rc.d/rc?.d
/etc/init.d
+%if "%{pld_release}" != "ac"
%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
+%endif
/etc/rc.d/init.d/functions
%attr(754,root,root) /etc/rc.d/init.d/allowlogin
@@ -352,6 +363,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.332 2010/09/23 20:03:45 glen
+- disable upstart on ac
+
Revision 1.331 2010/06/18 06:35:59 cactus
- patch0 - fix shutdown/restart on kernels with devtmpfs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.331&r2=1.332&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
