SPECS: rc-scripts.spec - up to 0.4.0.26 - add network service fix ...

[glen]

Author: glen                         Date: Thu Mar  9 19:46:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.4.0.26
- add network service fix patch

---- Files affected:
SPECS:
   rc-scripts.spec (1.220 -> 1.221) 

---- Diffs:

================================================================
Index: SPECS/rc-scripts.spec
diff -u SPECS/rc-scripts.spec:1.220 SPECS/rc-scripts.spec:1.221
--- SPECS/rc-scripts.spec:1.220	Tue Feb 14 01:34:23 2006
+++ SPECS/rc-scripts.spec	Thu Mar  9 20:46:10 2006
@@ -2,7 +2,7 @@
 
 # Conditional build:
 %bcond_without	static		# link binaries with glib dynamically
-%bcond_without	devalias 	# without dev_alias patch
+%bcond_with	devalias 	# with incomplete dev_alias patch
 #
 Summary:	inittab and /etc/rc.d scripts
 Summary(de):	inittab und /etc/rc.d Scripts
@@ -10,17 +10,14 @@
 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.25
-Release:	3
+Version:	0.4.0.26
+Release:	1
 License:	GPL
-Vendor:		PLD rc-scripts Team <pld-rc-scripts at pld-linux.org>
 Group:		Base
 Source0:	ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
-# Source0-md5:	7abb2bb88e547e45ff81b6693fd5ef3a
+# Source0-md5:	95e6a02311c6abc434614872434e0715
 Patch0:		%{name}-dev_alias.patch
-Patch1:		%{name}-getkey-timeout.patch
-Patch2:		%{name}-vserver-is-chroot.patch
-Patch3:		%{name}-cpuset-virt.patch
+Patch1:		%{name}-branch.patch
 URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -60,10 +57,10 @@
 Provides:	initscripts
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:	LPRng < 3.8.0-2
-Conflicts:	psacct < 6.3.5-10
 Conflicts:	openssh-server < 2:3.6.1p2-6
+Conflicts:	psacct < 6.3.5-10
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
 %define		localedir	/etc/sysconfig/locale
@@ -99,9 +96,7 @@
 %prep
 %setup -q
 %{?with_devalias:%patch0 -p0}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p0
+%patch1 -p0
 
 %build
 %{__aclocal}
@@ -162,6 +157,8 @@
 # make /etc/init.d symlink relative
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
+rm -rf $RPM_BUILD_ROOT%{_prefix}/doc/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -312,6 +309,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.221  2006/03/09 19:46:10  glen
+- up to 0.4.0.26
+- add network service fix patch
+
 Revision 1.220  2006/02/14 00:34:23  baggins
 - release 3
 - added cpuset virtualization
================================================================

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