[oz] Minor cleanups to the rawhide package.
Chris Lalancette
clalance at fedoraproject.org
Wed Jul 27 09:25:09 UTC 2011
commit 5e98aaf13c2dfc5a1d910a49018961bb36946918
Author: Chris Lalancette <clalance at redhat.com>
Date: Wed Jul 27 05:24:47 2011 -0400
Minor cleanups to the rawhide package.
Signed-off-by: Chris Lalancette <clalance at redhat.com>
oz.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/oz.spec b/oz.spec
index f436c1b..298d2d6 100644
--- a/oz.spec
+++ b/oz.spec
@@ -1,9 +1,7 @@
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
Summary: Library and utilities for automated guest OS installs
Name: oz
Version: 0.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2
Group: Development/Libraries
URL: http://aeolusproject.org/oz.html
@@ -35,13 +33,13 @@ Oz is a set of libraries and utilities for doing automated guest OS
installations, with minimal input from the user.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%build
python setup.py build
%install
-python setup.py install -O1 --root=$RPM_BUILD_ROOT
+python setup.py install --root=$RPM_BUILD_ROOT --skip-build
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/isocontent/
@@ -53,13 +51,13 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/icicletmp/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/oz/jeos
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/oz
-%{__cp} oz.cfg $RPM_BUILD_ROOT%{_sysconfdir}/oz
+cp oz.cfg $RPM_BUILD_ROOT%{_sysconfdir}/oz
chmod 755 $RPM_BUILD_ROOT%{python_sitelib}/oz/guesttools/*
%post
if [ ! -f %{_sysconfdir}/oz/id_rsa-icicle-gen ]; then
- ssh-keygen -t rsa -b 2048 -N "" -f %{_sysconfdir}/oz/id_rsa-icicle-gen
+ ssh-keygen -t rsa -b 2048 -N "" -f %{_sysconfdir}/oz/id_rsa-icicle-gen >& /dev/null
fi
%files
@@ -74,8 +72,7 @@ fi
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/floppies/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/icicletmp/
%dir %attr(0755, root, root) %{_localstatedir}/lib/oz/jeos
-%dir %attr(0755, root, root) %{python_sitelib}/oz
-%{python_sitelib}/oz/*
+%{python_sitelib}/oz
%{_bindir}/oz-install
%{_bindir}/oz-generate-icicle
%{_bindir}/oz-customize
@@ -85,6 +82,9 @@ fi
%changelog
+* Wed Jul 27 2011 Chris Lalancette <clalance at redhat.com> - 0.5.0-3
+- Minor cleanups to the spec file
+
* Tue Jul 05 2011 Pádraig Brady <P at draigBrady.com> - 0.5.0-2
- Adjust package as per updated Fedora standards
More information about the scm-commits
mailing list