SPECS (AC-branch): rc-scripts.spec - merge update to 0.4.1.24 from HEAD

[glen]

Author: glen                         Date: Mon Sep  8 18:26:23 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge update to 0.4.1.24 from HEAD

---- Files affected:
SPECS:
   rc-scripts.spec (1.267.2.13 -> 1.267.2.14) 

---- Diffs:

================================================================
Index: SPECS/rc-scripts.spec
diff -u SPECS/rc-scripts.spec:1.267.2.13 SPECS/rc-scripts.spec:1.267.2.14
--- SPECS/rc-scripts.spec:1.267.2.13	Mon May 19 08:15:40 2008
+++ SPECS/rc-scripts.spec	Mon Sep  8 20:26:17 2008
@@ -9,14 +9,16 @@
 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.23
+Version:	0.4.1.24
 Release:	1
 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:	72c3e96897b05e449b9d767e286e6548
+# Source0-md5:	1a4dc7af98112a7865b4b4a2e1a0e023
 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}
@@ -46,7 +48,7 @@
 Requires:	mount >= 2.12
 Requires:	net-tools
 Requires:	procps >= 1:3.2.6-1.1
-Requires:	psmisc >= 22.3-2
+Requires:	psmisc >= 22.5-2
 Requires:	utempter
 Requires:	util-linux
 Provides:	initscripts
@@ -57,6 +59,7 @@
 Conflicts:	openssh-server < 2:3.6.1p2-6
 Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
+Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_exec_prefix	/
@@ -94,6 +97,10 @@
 %setup -q
 
 %build
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 %configure \
 	--with-localedir=%{localedir}
 %{__make} \
@@ -327,7 +334,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.267.2.13  2008/05/19 06:15:40  glen
+Revision 1.267.2.14  2008/09/08 18:26:17  glen
+- merge update to 0.4.1.24 from HEAD
+
+Revision 1.267.2.13  2008-05-19 06:15:40  glen
 - 0.4.1.23 md5
 
 Revision 1.267.2.12  2008-05-19 06:15:27  glen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rc-scripts.spec?r1=1.267.2.13&r2=1.267.2.14&f=u