[openstack-swift/el6-icehouse] Update to Icehouse milestone 1.13.1.rc2
Alan Pevec
apevec at fedoraproject.org
Sat Apr 12 15:14:19 UTC 2014
commit 7946bc571e021e64d444ddcc3b38663847d8be49
Author: Alan Pevec <apevec at redhat.com>
Date: Sat Apr 12 16:35:29 2014 +0200
Update to Icehouse milestone 1.13.1.rc2
.gitignore | 1 +
...-parallel-install-versions-of-el6-package.patch | 2 +-
0002-Add-fixes-for-building-the-doc-package.patch | 2 +-
0003-remove-runtime-requirement-on-pbr.patch | 2 +-
0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch | 23 ----------------
openstack-swift.spec | 28 +++++++++++++++-----
sources | 2 +-
7 files changed, 26 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d7e2100..ceadfe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/swift-1.10.0.tar.gz
/swift-1.11.0.tar.gz
/swift-1.12.0.tar.gz
+/swift-1.13.1.rc2.tar.gz
diff --git a/0001-Use-updated-parallel-install-versions-of-el6-package.patch b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
index abe6d01..97d5765 100644
--- a/0001-Use-updated-parallel-install-versions-of-el6-package.patch
+++ b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
@@ -1,4 +1,4 @@
-From 3e772a40204c65db17a388a2ac6b9b9252fd114b Mon Sep 17 00:00:00 2001
+From 0ef1beab6067ae34c3e0c715a049b1fef9233459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Wed, 9 Oct 2013 12:04:27 +0100
Subject: [PATCH] Use updated parallel install versions of el6 packages
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index 8aec614..22ea544 100644
--- a/0002-Add-fixes-for-building-the-doc-package.patch
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -1,4 +1,4 @@
-From 1793fb10739deca0bf471945d3851c358544af2d Mon Sep 17 00:00:00 2001
+From 97a69b547adff53690e578683a61ec5230a9bb35 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Thu, 5 Jan 2012 00:03:00 +0100
Subject: [PATCH] Add fixes for building the doc package
diff --git a/0003-remove-runtime-requirement-on-pbr.patch b/0003-remove-runtime-requirement-on-pbr.patch
index 4cc4e5b..3fc7d0a 100644
--- a/0003-remove-runtime-requirement-on-pbr.patch
+++ b/0003-remove-runtime-requirement-on-pbr.patch
@@ -1,4 +1,4 @@
-From e7ee10d2fd2abd1a18824b972da3c6e25a44306a Mon Sep 17 00:00:00 2001
+From ec2e0303b352f4af6a02a23774e4e3a24b58599a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Wed, 9 Oct 2013 12:38:40 +0100
Subject: [PATCH] remove runtime requirement on pbr
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 67e9738..ddf0514 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -2,15 +2,20 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
+%global release_name icehouse
+%global milestone rc2
+
Name: openstack-swift
-Version: 1.12.0
-Release: 2%{?dist}
+Version: 1.13.1
+Release: 0.1.%{milestone}%{?dist}
Summary: OpenStack Object Storage (Swift)
Group: Development/Languages
License: ASL 2.0
URL: http://launchpad.net/swift
-Source0: http://launchpad.net/swift/havana/%{version}/+download/swift-%{version}.tar.gz
+#Source0: http://launchpad.net/swift/%{release_name}/%{version}/+download/swift-%{version}.tar.gz
+Source0: https://launchpad.net/swift/%{release_name}/%{version}-%{milestone}/+download/swift-%{version}.%{milestone}.tar.gz
+
Source1: %{name}-functions
Source2: %{name}-account.init
Source22: account-server.conf
@@ -48,12 +53,11 @@ Source600: %{name}-proxy.upstart
Source7: swift.conf
#
-# patches_base=1.12.0
+# patches_base=1.13.1.rc2
#
Patch0001: 0001-Use-updated-parallel-install-versions-of-el6-package.patch
Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
Patch0003: 0003-remove-runtime-requirement-on-pbr.patch
-Patch0004: 0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch
BuildArch: noarch
BuildRequires: python-devel
@@ -165,12 +169,14 @@ in clusters for reliable, redundant, and large-scale storage of static objects.
This package contains documentation files for %{name}.
%prep
-%setup -q -n swift-%{version}
+%setup -q -n swift-%{version}.%{milestone}
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
+
+sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
+
# Remove bundled egg-info
rm -rf swift.egg-info
# let RPM handle deps
@@ -408,6 +414,7 @@ fi
%{_bindir}/swift-form-signature
%{_bindir}/swift-temp-url
%{python_sitelib}/swift/*.py*
+%{python_sitelib}/swift/cli
%{python_sitelib}/swift/common
%{python_sitelib}/swift/account
%{python_sitelib}/swift/obj
@@ -420,6 +427,7 @@ fi
%{_datadir}/%{name}/%{name}-account*.upstart
%{_mandir}/man5/account-server.conf.5*
%{_mandir}/man1/swift-account-auditor.1*
+%{_mandir}/man1/swift-account-info.1*
%{_mandir}/man1/swift-account-reaper.1*
%{_mandir}/man1/swift-account-replicator.1*
%{_mandir}/man1/swift-account-server.1*
@@ -427,6 +435,7 @@ fi
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/account-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/account-server
%{_bindir}/swift-account-auditor
+%{_bindir}/swift-account-info
%{_bindir}/swift-account-reaper
%{_bindir}/swift-account-replicator
%{_bindir}/swift-account-server
@@ -438,6 +447,7 @@ fi
%{_datadir}/%{name}/%{name}-container*.upstart
%{_mandir}/man5/container-server.conf.5*
%{_mandir}/man1/swift-container-auditor.1*
+%{_mandir}/man1/swift-container-info.1*
%{_mandir}/man1/swift-container-replicator.1*
%{_mandir}/man1/swift-container-server.1*
%{_mandir}/man1/swift-container-sync.1*
@@ -446,6 +456,7 @@ fi
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/container-server.conf
%dir %attr(0755, swift, root) %{_localstatedir}/run/swift/container-server
%{_bindir}/swift-container-auditor
+%{_bindir}/swift-container-info
%{_bindir}/swift-container-server
%{_bindir}/swift-container-replicator
%{_bindir}/swift-container-updater
@@ -502,6 +513,9 @@ fi
%doc LICENSE doc/build/html
%changelog
+* Sat Apr 12 2014 Alan Pevec <apevec at redhat.com> 1.13.1-0.1.rc2
+- Update to Icehouse milestone 1.13.1.rc2
+
* Wed Mar 05 2014 Pete Zaitcev <zaitcev at redhat.com> 1.12.0-2
- Quick-fix building on EPEL 6 due to downrev Sphinx
diff --git a/sources b/sources
index 4460e73..cf99030 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3f9d4d322d480d7344b85444916598c swift-1.12.0.tar.gz
+ea1dba049eb837e7a76c3fbc8068c6d0 swift-1.13.1.rc2.tar.gz
More information about the scm-commits
mailing list