[koji/el6/master] dont require qemu-img on epel, add a readme with a little info on it
Dennis Gilmore
ausil at fedoraproject.org
Mon Jan 3 19:50:45 UTC 2011
commit 137c65612eb83d8e197544c7171ed05453f638fe
Author: Dennis Gilmore <dennis at ausil.us>
Date: Mon Jan 3 13:49:51 2011 -0600
dont require qemu-img on epel, add a readme with a little info on it
README.epel | 3 +++
koji.spec | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/README.epel b/README.epel
new file mode 100644
index 0000000..276abde
--- /dev/null
+++ b/README.epel
@@ -0,0 +1,3 @@
+koji-vm requires qemu-img. the deps is dropped from epel packaging as Red Hat
+only ships the virt stack on x86_64. you will need to install it yourself or
+build and maintain it on a non Red Hat supported arch.
diff --git a/koji.spec b/koji.spec
index 4ea6107..f03893f 100644
--- a/koji.spec
+++ b/koji.spec
@@ -9,7 +9,8 @@ Summary: Build system tools
Group: Applications/System
URL: http://fedorahosted.org/koji
Patch0: fedora-config.patch
-Source: https://fedorahosted.org/releases/k/o/koji/%{name}-%{version}.tar.bz2
+Source0: https://fedorahosted.org/releases/k/o/koji/%{name}-%{version}.tar.bz2
+Source1: README.epel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -90,7 +91,10 @@ Requires(preun): /sbin/service
Requires: libvirt-python
Requires: libxml2-python
Requires: python-virtinst
+%if 0%{?fedora}
+#Red Hat only ships on x86_64
Requires: qemu-img
+%endif
%description vm
koji-vm contains a supplemental build daemon that executes certain tasks in a
@@ -122,6 +126,7 @@ koji-web is a web UI to the Koji system.
%prep
%setup -q
%patch0 -p1 -b .orig
+cp $SOURCE2 .
%build
@@ -198,6 +203,7 @@ fi
%files vm
%defattr(-,root,root)
+%doc README.epel
%{_sbindir}/kojivmd
%{_datadir}/kojivmd
%{_initrddir}/kojivmd
@@ -224,6 +230,10 @@ if [ $1 = 0 ]; then
fi
%changelog
+* Mon Jan 03 2011 Dennis Gilmore <dennis at ausil.us> - 1.6.0-1.1
+- drop Requires on qemu-img on epel for koji-vm
+- add readme note on epel
+
* Fri Dec 17 2010 Dennis Gilmore <dennis at ausil.us> - 1.6.0-1
- update to 1.6.0
More information about the scm-commits
mailing list