From 4b54741f430147afbdf85307e03fada84ff4a79d Mon Sep 17 00:00:00 2001
From: Brian Pellin <bpellin@mcs.anl.gov>
Date: Fri, 7 Jan 2005 16:56:20 +0000
Subject: Fixed spec file.

(Logical change 1.177)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@768 ce84e21b-d406-0410-9b95-82705330c041
---
 misc/bcfg2.spec | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'misc')

diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 71508ef2c..588ac1740 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -1,9 +1,10 @@
 %define name bcfg2
-%define version 0.2
+%define version 0.6.1
 %define release 1
+%define pythonversion 2.2
 
-Summary: Bcfg2 Server
-Name: %{name}-server
+Summary: Bcfg2 Client
+Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{name}-%{version}.tar.gz
@@ -17,27 +18,28 @@ Vendor: Narayan Desai <desai@mcs.anl.gov>
 %description
 Bcfg2 is a configuration management tool.
 
-%package -n bcfg2
-Name: %{name}
+%package -n bcfg2-server
 Version: %{version}
-Summary: Bcfg2 client
+Summary: Bcfg2 Server
 Group: System Tools
 Requires: sslib-python
 
-%description -n bcfg2-client
+%description -n bcfg2-server
 Bcfg2 client
 
 %prep
 %setup -q
 
 %build
-python setup.py build
+python%{pythonversion} setup.py build
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python%{pythonversion} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+mkdir -p ${RPM_BUILD_ROOT}/usr/sbin
+mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
 mv ${RPM_BUILD_ROOT}/usr/bin/Bcfg2Server ${RPM_BUILD_ROOT}/usr/sbin
 mv ${RPM_BUILD_ROOT}/usr/bin/ValidateBcfg2Repo ${RPM_BUILD_ROOT}/usr/sbin
-mv ${RPM_BUILD_ROOT}/usr/bin/bcfg ${RPM_BUILD_ROOT}/usr/sbin
+mv ${RPM_BUILD_ROOT}/usr/bin/bcfg2 ${RPM_BUILD_ROOT}/usr/sbin
 install -m 755 debian/bcfg2.init ${RPM_BUILD_ROOT}/etc/init.d/bcfg2
 install -m 755 debian/bcfg2-server.init ${RPM_BUILD_ROOT}/etc/init.d/bcfg2-server
 
@@ -48,17 +50,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/sbin/Bcfg2Server
 /usr/sbin/ValidateBcfg2Repo
-/usr/lib/python2.3/site-packages/Bcfg2/Server/*
+/usr/lib/python%{pythonversion}/site-packages/Bcfg2/Server/*
 /usr/share/bcfg2/schemas/*
 /usr/share/man/man8/*
 /etc/init.d/bcfg2-server
-%config(noreplace) /etc/bcfg2.conf
 
 %files -n bcfg2
 %defattr(-,root,root)
 /usr/sbin/bcfg2
-/usr/lib/python2.3/site-packages/Bcfg2/__init__.py
-/usr/lib/python2.3/site-packages/Bcfg2/Client/*
+/usr/lib/python%{pythonversion}/site-packages/Bcfg2/__init__.py
+/usr/lib/python%{pythonversion}/site-packages/Bcfg2/Client/*
 /usr/share/man/man1/*
 /etc/init.d/bcfg2
 
-- 
cgit v1.2.3-1-g7c22