packages: bcfg2/bcfg2.spec - more Requires and BuildRequires

[paszczus]

Author: paszczus                     Date: Wed Feb 10 09:20:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more Requires and BuildRequires

---- Files affected:
packages/bcfg2:
   bcfg2.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/bcfg2/bcfg2.spec
diff -u packages/bcfg2/bcfg2.spec:1.2 packages/bcfg2/bcfg2.spec:1.3
--- packages/bcfg2/bcfg2.spec:1.2	Wed Feb 10 10:09:15 2010
+++ packages/bcfg2/bcfg2.spec	Wed Feb 10 10:20:17 2010
@@ -8,6 +8,13 @@
 URL:		http://trac.mcs.anl.gov/projects/bcfg2
 Source0:	ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}.tar.gz
 # Source0-md5:	6fbf36acc5cc58b2504a25c25cad3921
+BuildRequires:	python-devel
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.219
+Requires:	python-modules
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
 %description
 Bcfg2 helps system administrators produce a consistent, reproducible,
 and verifiable description of their environment, and offers
@@ -38,6 +45,8 @@
 Summary:	Bcfg2 Server
 Group:		Networking/Daemons
 Requires:	bcfg2
+Requires:	pydoc
+Requires:	python-lxml
 Requires:	python-pyOpenSSL
 
 %description -n bcfg2-server
@@ -91,8 +100,8 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
 install -d $RPM_BUILD_ROOT%{_libdir}/bcfg2
 %{__mv} $RPM_BUILD_ROOT%{_bindir}/bcfg2* $RPM_BUILD_ROOT%{_sbindir}
-install debian/bcfg2.init $RPM_BUILD_ROOT%{_initrddir}/bcfg2
-install debian/bcfg2-server.init $RPM_BUILD_ROOT%{_initrddir}/bcfg2-server
+install debian/bcfg2.init $RPM_BUILD_ROOT/etc/rc.d/init.d/bcfg2
+install debian/bcfg2-server.init $RPM_BUILD_ROOT/etc/rc.d/init.d/bcfg2-server
 install debian/bcfg2.default $RPM_BUILD_ROOT%{_sysconfdir}/default/bcfg2
 install debian/bcfg2-server.default $RPM_BUILD_ROOT%{_sysconfdir}/default/bcfg2-server
 install debian/bcfg2.cron.daily $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/bcfg2
@@ -102,12 +111,15 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n bcfg2-server
+/sbin/chkconfig --add bcfg2-server
+
 %files -n bcfg2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/bcfg2
 %dir %{py_sitescriptdir}/Bcfg2
 %{py_sitescriptdir}/Bcfg2/*.py[co]
-%{py_sitescriptdir}/Bcfg2/Client
+%dir %{py_sitescriptdir}/Bcfg2/Client
 %{py_sitescriptdir}/Bcfg2/Client/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -117,12 +129,9 @@
 /etc/cron.daily/bcfg2
 %{_libdir}/bcfg2/bcfg2-cron
 
-%post -n bcfg2-server
-/sbin/chkconfig --add bcfg2-server
-
 %files -n bcfg2-server
 %defattr(644,root,root,755)
-%{_initrddir}/bcfg2-server
+%attr(754,root,root)  /etc/rc.d/init.d/bcfg2-server
 %{py_sitescriptdir}/Bcfg2/Server
 %{_datadir}/bcfg2
 %config(noreplace) %{_sysconfdir}/default/bcfg2-server
@@ -142,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/02/10 09:20:17  paszczus
+- more Requires and BuildRequires
+
 Revision 1.2  2010/02/10 09:09:15  paszczus
 - fixed %dir, proper name for python R, cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bcfg2/bcfg2.spec?r1=1.2&r2=1.3&f=u