[openstack-manila] Upstream 2014.2.rc2
Haïkel Guémar
hguemar at fedoraproject.org
Tue Oct 14 13:45:35 UTC 2014
commit 6c0b9cffec2695d01a06564f6f0360e39467e703
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date: Tue Oct 14 15:19:46 2014 +0200
Upstream 2014.2.rc2
.gitignore | 1 +
...slosphinx.patch => 0001-oslo.sphinx-patch.patch | 21 ++++++---
0002-Remove-runtime-dep-on-pbr.patch | 49 ++++++++++++++++++++
openstack-manila.spec | 45 ++++++++++--------
sources | 2 +-
5 files changed, 89 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59d7419..51ea388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/manila-2014.2.dev32.g5d54abf.tar.gz
+/manila-2014.2.rc2.tar.gz
diff --git a/manila-2014.2-oslosphinx.patch b/0001-oslo.sphinx-patch.patch
similarity index 62%
rename from manila-2014.2-oslosphinx.patch
rename to 0001-oslo.sphinx-patch.patch
index db55874..402ae8b 100644
--- a/manila-2014.2-oslosphinx.patch
+++ b/0001-oslo.sphinx-patch.patch
@@ -1,14 +1,18 @@
-commit 8399c2d83746075c28e4aa163bc5ab023d725546
-Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
-Date: Wed Sep 10 18:52:48 2014 -0600
+From 4acfcbf58b286a0c9d2f4b8d467433f4b31414bb Mon Sep 17 00:00:00 2001
+From: Haikel Guemar <hguemar at fedoraproject.org>
+Date: Wed, 8 Oct 2014 09:45:41 +0200
+Subject: [PATCH 1/2] oslo.sphinx patch
- oslo.sphinx
+(from Pete Zaitcev)
+---
+ doc/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index ed14d26..4b0fd70 100644
+index 75bc194..65b7279 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -35,7 +35,7 @@ extensions = ['sphinx.ext.autodoc',
+@@ -34,7 +34,7 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.pngmath',
'sphinx.ext.ifconfig',
'sphinx.ext.graphviz',
@@ -17,7 +21,7 @@ index ed14d26..4b0fd70 100644
]
# autodoc generation is a bit aggressive and a nuisance
-@@ -140,7 +140,7 @@ man_pages = [
+@@ -139,7 +139,7 @@ man_pages = [
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
@@ -26,3 +30,6 @@ index ed14d26..4b0fd70 100644
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
+--
+2.1.0
+
diff --git a/0002-Remove-runtime-dep-on-pbr.patch b/0002-Remove-runtime-dep-on-pbr.patch
new file mode 100644
index 0000000..3b7a0aa
--- /dev/null
+++ b/0002-Remove-runtime-dep-on-pbr.patch
@@ -0,0 +1,49 @@
+From 4a315d773daa508d46e0246d78642fce6d71287e Mon Sep 17 00:00:00 2001
+From: Haikel Guemar <hguemar at fedoraproject.org>
+Date: Tue, 14 Oct 2014 15:30:36 +0200
+Subject: [PATCH 2/2] Remove runtime dep on pbr
+
+---
+ manila/version.py | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/manila/version.py b/manila/version.py
+index 75aecef..9e912a8 100644
+--- a/manila/version.py
++++ b/manila/version.py
+@@ -14,12 +14,30 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-from pbr import version as pbr_version
+
+ MANILA_VENDOR = "OpenStack Foundation"
+ MANILA_PRODUCT = "OpenStack Manila"
+ MANILA_PACKAGE = None # OS distro package version suffix
+
++class VersionInfo(object):
++ release = "REDHATMANILARELEASE"
++ version = "REDHATMANILAVERSION"
++
++ def version_string(self):
++ return self.version
++
++ def cached_version_string(self):
++ return self.version
++
++ def release_string(self):
++ return self.release
++
++ def canonical_version_string(self):
++ return self.version
++
++ def version_string_with_vcs(self):
++ return self.release
++
+ loaded = False
+-version_info = pbr_version.VersionInfo('manila')
++version_info = VersionInfo()
+ version_string = version_info.version_string
+--
+2.1.0
+
diff --git a/openstack-manila.spec b/openstack-manila.spec
index 96c2955..da6c176 100644
--- a/openstack-manila.spec
+++ b/openstack-manila.spec
@@ -1,17 +1,21 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
+%global milestone rc2
+%global upstream_name manila
+
Name: openstack-manila
Version: 2014.2
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
Summary: OpenStack Shared Filesystem Service
-Group: Applications/System
License: ASL 2.0
-# We're only incubated, so we're not on openstack.org.
-# URL: http://www.openstack.org/software/openstack-filesystem/
-URL: http://github.com/stackforge/manila
-#Source0: https://launchpad.net/manila/icehouse/2014.2/+download/manila-%{version}.tar.gz
-Source0: manila-2014.2.dev32.g5d54abf.tar.gz
+URL: https://wiki.openstack.org/wiki/Manila
+#Source0: https://launchpad.net/manila/juno/2014.2/+download/manila-%{version}.tar.gz
+# No tarball provided by upstream
+# Retrieved from https://github.com/openstack/manila/archive/%{version}.%{milestone}.tar.gz
+# Renamed to %{upstream_name}-%{version}.%{milestone}.tar.gz
+# as github can't generate proper tarballs
+Source0: %{upstream_name}-%{version}.%{milestone}.tar.gz
Source1: manila.conf
Source2: manila.logrotate
Source3: manila-dist.conf
@@ -23,12 +27,11 @@ Source12: openstack-manila-share.service
Source20: manila-sudoers
-Patch01: manila-2014.2-oslosphinx.patch
-
#
-# patches_base=2013.2
+# patches_base=2014.2
#
-#Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch0001: 0001-oslo.sphinx-patch.patch
+Patch0002: 0002-Remove-runtime-dep-on-pbr.patch
BuildArch: noarch
# XXX Although intltool pulls gettext, we still traceback with undeclared '_'
@@ -38,6 +41,7 @@ BuildRequires: python-oslo-sphinx
BuildRequires: python-pbr
BuildRequires: python-setuptools
BuildRequires: python-sphinx
+BuildRequires: python2-devel
Requires: openstack-utils
Requires: python-manila = %{version}-%{release}
@@ -158,11 +162,7 @@ This package contains the associated documentation.
%endif
%prep
-#setup -q -n manila-%{version}
-%setup -q -n manila-2014.2.dev32.g5d54abf
-
-%patch01 -p1
-#patch0001 -p1
+%autosetup -n %{upstream_name}-%{version}.%{milestone} -S git
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -172,15 +172,15 @@ find manila -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
# to distutils requires_dist config
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
-# We add REDHATCINDERVERSION/RELEASE with the pbr removal patch
-sed -i s/REDHATCINDERVERSION/%{version}/ manila/version.py
-sed -i s/REDHATCINDERRELEASE/%{release}/ manila/version.py
+# We add REDHATMANILAVERSION/RELEASE with the pbr removal patch
+sed -i s/REDHATMANILAVERSION/%{version}/ manila/version.py
+sed -i s/REDHATMANILARELEASE/%{release}/ manila/version.py
%build
-%{__python} setup.py build
+%{__python2} setup.py build
%install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
# docs generation requires everything to be installed first
export PYTHONPATH="$( pwd ):$PYTHONPATH"
@@ -322,6 +322,9 @@ getent passwd manila >/dev/null || \
%endif
%changelog
+* Tue Oct 14 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 2014.2-0.3
+- Upstream 2014.2.rc2
+
* Wed Sep 10 2014 Pete Zaitcev <zaitcev at redhat.com>
- 2014.2-0.2
- Address review comments bz#1125033 comment#2
diff --git a/sources b/sources
index fb7ac9e..fdae63e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f92c5be6f4ba7848b68b315d1d514a2b manila-2014.2.dev32.g5d54abf.tar.gz
+f5343b9a7da668e00173b328e2feb15d manila-2014.2.rc2.tar.gz
More information about the scm-commits
mailing list