[condor-wallaby] Fixed dependency version on python-wallabyclient
rrati
rrati at fedoraproject.org
Wed Jan 11 21:35:06 UTC 2012
commit 60cf025949711f7aeebe3cae0ce6e10392ed4ecf
Author: Robert Rati <rrati at redhat.com>
Date: Wed Jan 11 15:34:19 2012 -0600
Fixed dependency version on python-wallabyclient
...aging-improvements-for-building-on-fedora.patch | 2 +-
0002-Packaging-fixes.patch | 2 +-
0003-Workflow-and-packaging-improvements.patch | 2 +-
0004-Bumped-spec-to-4.1.2-2.patch | 2 +-
...ependency-version-on-python-wallabyclient.patch | 34 ++++++++++++++++++++
0006-Bumped-spec-to-4.1.2-3.patch | 26 +++++++++++++++
condor-wallaby.spec | 13 ++++++--
7 files changed, 74 insertions(+), 7 deletions(-)
---
diff --git a/0001-Packaging-improvements-for-building-on-fedora.patch b/0001-Packaging-improvements-for-building-on-fedora.patch
index 20a253e..9084756 100644
--- a/0001-Packaging-improvements-for-building-on-fedora.patch
+++ b/0001-Packaging-improvements-for-building-on-fedora.patch
@@ -1,7 +1,7 @@
From f19e04eaaf53b26a8efdc7c69fc0419fb769b15e Mon Sep 17 00:00:00 2001
From: Robert Rati <rrati at redhat.com>
Date: Fri, 18 Nov 2011 14:50:34 -0600
-Subject: [PATCH 1/4] Packaging improvements for building on fedora
+Subject: [PATCH 1/6] Packaging improvements for building on fedora
---
Makefile | 5 ++---
diff --git a/0002-Packaging-fixes.patch b/0002-Packaging-fixes.patch
index 5923b7c..c97d7d7 100644
--- a/0002-Packaging-fixes.patch
+++ b/0002-Packaging-fixes.patch
@@ -1,7 +1,7 @@
From 5a6eaeec08f29af51b1fa217414654f03bf180c9 Mon Sep 17 00:00:00 2001
From: Robert Rati <rrati at redhat.com>
Date: Tue, 3 Jan 2012 14:36:07 -0600
-Subject: [PATCH 2/4] Packaging fixes
+Subject: [PATCH 2/6] Packaging fixes
---
Makefile | 2 +-
diff --git a/0003-Workflow-and-packaging-improvements.patch b/0003-Workflow-and-packaging-improvements.patch
index e615a08..634c378 100644
--- a/0003-Workflow-and-packaging-improvements.patch
+++ b/0003-Workflow-and-packaging-improvements.patch
@@ -1,7 +1,7 @@
From 893be9e3f4b5cbd9587a37ac7a96ee7c1815045d Mon Sep 17 00:00:00 2001
From: Robert Rati <rrati at redhat.com>
Date: Fri, 6 Jan 2012 10:16:21 -0600
-Subject: [PATCH 3/4] Workflow and packaging improvements Added VERSION file
+Subject: [PATCH 3/6] Workflow and packaging improvements Added VERSION file
---
Makefile | 92 ++++++--
diff --git a/0004-Bumped-spec-to-4.1.2-2.patch b/0004-Bumped-spec-to-4.1.2-2.patch
index 2110749..78be57f 100644
--- a/0004-Bumped-spec-to-4.1.2-2.patch
+++ b/0004-Bumped-spec-to-4.1.2-2.patch
@@ -1,7 +1,7 @@
From 19028ae1f0b9c7a7c57839d8cf7c0b184e169d06 Mon Sep 17 00:00:00 2001
From: Robert Rati <rrati at redhat.com>
Date: Fri, 6 Jan 2012 10:21:47 -0600
-Subject: [PATCH 4/4] Bumped spec to 4.1.2-2
+Subject: [PATCH 4/6] Bumped spec to 4.1.2-2
---
condor-wallaby.spec.in | 4 ++++
diff --git a/0005-Fixed-dependency-version-on-python-wallabyclient.patch b/0005-Fixed-dependency-version-on-python-wallabyclient.patch
new file mode 100644
index 0000000..c9078a3
--- /dev/null
+++ b/0005-Fixed-dependency-version-on-python-wallabyclient.patch
@@ -0,0 +1,34 @@
+From 7e14abf10f4d89efc7c023dcbea34d81a1c7fe60 Mon Sep 17 00:00:00 2001
+From: Robert Rati <rrati at redhat.com>
+Date: Wed, 11 Jan 2012 15:28:30 -0600
+Subject: [PATCH 5/6] Fixed dependency version on python-wallabyclient
+
+---
+ condor-wallaby.spec.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/condor-wallaby.spec.in b/condor-wallaby.spec.in
+index ce031c6..fbd25ec 100644
+--- a/condor-wallaby.spec.in
++++ b/condor-wallaby.spec.in
+@@ -33,7 +33,7 @@ Requires: condor >= 7.4.4-0.9
+ Requires: python >= 2.3
+ Requires: python-qmf >= 0.9.1073306
+ Requires: python-condorutils >= 1.5-4
+-Requires: python-wallabyclient = %{version}-%{release}%{?dist}
++Requires: python-wallabyclient = %{version}
+ %if 0%{?fedora} == 0
+ Obsoletes: condor-remote-configuration
+ %endif
+@@ -51,7 +51,7 @@ Summary: Wallaby configuration tools for configuring condor
+ Group: Applications/System
+ Requires: python >= 2.4
+ Requires: python-qmf >= 0.9.1073306
+-Requires: python-wallabyclient >= %{version}-%{release}%{?dist}
++Requires: python-wallabyclient >= %{version}
+ Requires: PyYAML
+ Requires: vim-minimal
+ %if 0%{?fedora} == 0
+--
+1.7.6.5
+
diff --git a/0006-Bumped-spec-to-4.1.2-3.patch b/0006-Bumped-spec-to-4.1.2-3.patch
new file mode 100644
index 0000000..e672c1d
--- /dev/null
+++ b/0006-Bumped-spec-to-4.1.2-3.patch
@@ -0,0 +1,26 @@
+From fc8af10990a0532e1b5d9f5485c3440ae2074589 Mon Sep 17 00:00:00 2001
+From: Robert Rati <rrati at redhat.com>
+Date: Wed, 11 Jan 2012 15:30:26 -0600
+Subject: [PATCH 6/6] Bumped spec to 4.1.2-3
+
+---
+ condor-wallaby.spec.in | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/condor-wallaby.spec.in b/condor-wallaby.spec.in
+index fbd25ec..a128afb 100644
+--- a/condor-wallaby.spec.in
++++ b/condor-wallaby.spec.in
+@@ -145,6 +145,9 @@ rm -rf %{buildroot}
+ %{python_sitelib}/wallabyclient/exceptions.py*
+
+ %changelog
++* Fri Jan 11 2012 <rrati at redhat> - 4.1.2-3
++- Fixed dependency issue on python-wallabyclient
++
+ * Fri Jan 6 2012 <rrati at redhat> - 4.1.2-2
+ - Workflow and packaging improvements
+ - Added VERSION file
+--
+1.7.6.5
+
diff --git a/condor-wallaby.spec b/condor-wallaby.spec
index 6844a29..431a289 100644
--- a/condor-wallaby.spec
+++ b/condor-wallaby.spec
@@ -9,7 +9,7 @@
Name: condor-wallaby
Summary: Condor configuration using wallaby
Version: 4.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/System
License: ASL 2.0
URL: http://git.fedorahosted.org/git/grid/configuration-tools.git
@@ -18,6 +18,8 @@ Patch0: 0001-Packaging-improvements-for-building-on-fedora.patch
Patch1: 0002-Packaging-fixes.patch
Patch2: 0003-Workflow-and-packaging-improvements.patch
Patch3: 0004-Bumped-spec-to-4.1.2-2.patch
+Patch4: 0005-Fixed-dependency-version-on-python-wallabyclient.patch
+Patch5: 0006-Bumped-spec-to-4.1.2-3.patch
%if %{building_for_el5}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif
@@ -36,7 +38,7 @@ Requires: condor >= 7.4.4-0.9
Requires: python >= 2.3
Requires: python-qmf >= 0.9.1073306
Requires: python-condorutils >= 1.5-4
-Requires: python-wallabyclient = %{version}-%{release}%{?dist}
+Requires: python-wallabyclient = %{version}
%if 0%{?fedora} == 0
Obsoletes: condor-remote-configuration
%endif
@@ -54,7 +56,7 @@ Summary: Wallaby configuration tools for configuring condor
Group: Applications/System
Requires: python >= 2.4
Requires: python-qmf >= 0.9.1073306
-Requires: python-wallabyclient >= %{version}-%{release}%{?dist}
+Requires: python-wallabyclient >= %{version}
Requires: PyYAML
Requires: vim-minimal
%if 0%{?fedora} == 0
@@ -89,6 +91,8 @@ Tools for interacting with wallaby
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
@@ -151,6 +155,9 @@ rm -rf %{buildroot}
%{python_sitelib}/wallabyclient/exceptions.py*
%changelog
+* Fri Jan 11 2012 <rrati at redhat> - 4.1.2-3
+- Fixed dependency issue on python-wallabyclient
+
* Fri Jan 6 2012 <rrati at redhat> - 4.1.2-2
- Workflow and packaging improvements
- Added VERSION file
More information about the scm-commits
mailing list