BR: rpmbuild(macros) >= 1.710

[packages/bcfg2.git] / bcfg2.spec

diff --git a/bcfg2.spec b/bcfg2.spec
index 137b6f22cf39ad31632d4e2894dfd0a14c14c514..3198401bf9b0647eb6664cd1d2be1fdc26d27f49 100644 (file)
--- a/bcfg2.spec
+++ b/bcfg2.spec
@@ -7,6 +7,13 @@ Group:         Applications/System
 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.710
+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
@@ -37,6 +44,8 @@ deployment strategies.
 Summary:       Bcfg2 Server
 Group:         Networking/Daemons
 Requires:      bcfg2
+Requires:      pydoc
+Requires:      python-lxml
 Requires:      python-pyOpenSSL
 
 %description -n bcfg2-server
@@ -69,14 +78,11 @@ deployment strategies.
 %setup -q
 
 %build
-export CFLAGS="%{rpmcflags}"
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
-        --optimize=2 \
-        --root=$RPM_BUILD_ROOT
+%py_install
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -90,8 +96,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 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 redhat/scripts/bcfg2.init $RPM_BUILD_ROOT/etc/rc.d/init.d/bcfg2
+install redhat/scripts/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
@@ -101,12 +107,15 @@ install tools/bcfg2-cron $RPM_BUILD_ROOT%{_libdir}/bcfg2/bcfg2-cron
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -n bcfg2
+%post -n bcfg2-server
+/sbin/chkconfig --add bcfg2-server
+
+%files
 %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/*
@@ -116,12 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 /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