[vdsm/f18] vdsm.spec: patches to make el7 compatible
Douglas Schilling Landgraf
dougsland at fedoraproject.org
Tue Jan 15 21:27:45 UTC 2013
commit f5ffc8860c46fe4132339a4ccfe573177fc160dc
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date: Tue Jan 15 19:22:49 2013 -0500
vdsm.spec: patches to make el7 compatible
- python-ordereddict only for rhel more then 7
- dont require python ordereddict on fedora
- BuildRequires python-pthreading
vdsm.spec | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/vdsm.spec b/vdsm.spec
index 4b9f485..fcf76cd 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -32,7 +32,7 @@
Name: %{vdsm_name}
Version: 4.10.3
-Release: 3%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release: 4%{?vdsm_relvtag}%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -54,6 +54,9 @@ Patch2: 0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
Patch3: 0004-caps.py-osversion-validate-OVIRT.patch
Patch4: 0005-restarting-libvirtd-didn-t-work-over-allinone-setup.patch
Patch5: 0006-Integrate-Smartcard-support.patch
+Patch6: 0007-vdsm.spec-python-ordereddict-only-for-rhel-more-then-7.patch
+Patch7: 0008-vdsm-spec-dont-require-python-ordereddict-on-fedora.patch
+Patch8: 0009-vdsm.spec-BuildRequires-python-pthreading.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -429,6 +432,9 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%patch3 -p1 -b .patch3
%patch4 -p1 -b .patch4
%patch5 -p1 -b .patch5
+%patch6 -p1 -b .patch6
+%patch7 -p1 -b .patch7
+%patch8 -p1 -b .patch8
%if 0%{?rhel} == 6
sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1018,6 +1024,11 @@ exit 0
%{_datadir}/%{vdsm_name}/gluster/hostname.py*
%changelog
+* Tue Jan 15 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-4
+- python-ordereddict only for rhel more then 7
+- dont require python ordereddict on fedora
+- BuildRequires python-pthreading
+
* Wed Jan 02 2013 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-3
- caps.py: osversion() validate OVIRT
- restarting libvirtd didn't work over allinone setup
More information about the scm-commits
mailing list