SPECS: rc-scripts.spec - merged 0.4.1.4 from AC-branch

[glen]

Author: glen                         Date: Sun Feb 25 01:13:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged 0.4.1.4 from AC-branch

---- Files affected:
SPECS:
   rc-scripts.spec (1.253 -> 1.254) 

---- Diffs:

================================================================
Index: SPECS/rc-scripts.spec
diff -u SPECS/rc-scripts.spec:1.253 SPECS/rc-scripts.spec:1.254
--- SPECS/rc-scripts.spec:1.253	Sun Feb 25 02:11:17 2007
+++ SPECS/rc-scripts.spec	Sun Feb 25 02:12:59 2007
@@ -10,16 +10,15 @@
 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.3
-Release:	4
+Version:	0.4.1.4
+Release:	1
 License:	GPL
 Group:		Base
 #Source0:	ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	cd89c4f89ec9068d6a7ed020e874353c
+# Source0-md5:	806501b18ce49aa9ad30b826c1d2b17f
 Patch0:		%{name}-dev_alias.patch
-Patch1:		%{name}-exclude_rm_cups.patch
-Patch2:		%{name}-sleep.patch
+Patch1:		%{name}-sleep.patch
 URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -63,6 +62,7 @@
 Conflicts:	LPRng < 3.8.0-2
 Conflicts:	openssh-server < 2:3.6.1p2-6
 Conflicts:	psacct < 6.3.5-10
+Conflicts:	tzdata < 2007b-1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
@@ -100,7 +100,6 @@
 %setup -q
 %{?with_devalias:%patch0 -p0}
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -127,7 +126,6 @@
 	ln -s ../init.d/local $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99local
 	ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S10network
 	ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99allowlogin
-	ln -s ../init.d/timezone $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S10timezone
 	ln -s ../init.d/sys-chroots $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99sys-chroots
 done
 
@@ -210,7 +208,6 @@
 %attr(754,root,root) /etc/rc.d/init.d/random
 %attr(754,root,root) /etc/rc.d/init.d/single
 %attr(754,root,root) /etc/rc.d/init.d/sys-chroots
-%attr(754,root,root) /etc/rc.d/init.d/timezone
 
 %attr(754,root,root) /etc/rc.d/rc
 %attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/rc.local
@@ -234,7 +231,6 @@
 %attr(754,root,root) /etc/rc.d/rc?.d/S??random
 %attr(754,root,root) /etc/rc.d/rc?.d/S??single
 %attr(754,root,root) /etc/rc.d/rc?.d/S??sys-chroots
-%attr(754,root,root) /etc/rc.d/rc?.d/S??timezone
 
 %dir /var/cache/rc-scripts
 %ghost /var/cache/rc-scripts/msg.cache
@@ -270,8 +266,28 @@
 %dir /etc/sysconfig/interfaces
 %dir /etc/sysconfig/interfaces/data
 %dir /etc/sysconfig/isapnp
+
 %dir /etc/sysconfig/network-scripts
-%attr(755,root,root) /etc/sysconfig/network-scripts/if*
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-br
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-irda
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-post
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-ppp
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-sl
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifdown-vlan
+/etc/sysconfig/network-scripts/ifup-aliases
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-br
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-ipx
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-irda
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-iucv
+/etc/sysconfig/network-scripts/ifup-neigh
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-plip
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-plusb
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-post
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-ppp
+/etc/sysconfig/network-scripts/ifup-routes
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-sl
+%attr(755,root,root) /etc/sysconfig/network-scripts/ifup-vlan
+
 /etc/sysconfig/network-scripts/functions.network
 %dir /etc/sysconfig/interfaces/down.d
 %dir /etc/sysconfig/interfaces/down.d/*
@@ -298,7 +314,6 @@
 %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) %verify(not md5 mtime size) /etc/sysconfig/timezone
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/sysconfig/static-rules
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system
 
@@ -320,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.254  2007/02/25 01:12:59  glen
+- merged 0.4.1.4 from AC-branch
+
 Revision 1.253  2007/02/25 01:11:17  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.253&r2=1.254&f=u