[openstack-zaqar] Update to upstream 2014.2

[Haïkel Guémar]

commit 30ffe8b48b55373c9550c38e63d8613897726e0b
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sun Oct 19 23:34:51 2014 +0200

    Update to upstream 2014.2

 .gitignore                                  |    1 +
 0001-Remove-runtime-dependency-on-PBR.patch |   26 ++++++++++++++++++--------
 openstack-zaqar.spec                        |   23 ++++++++++++++++-------
 sources                                     |    2 +-
 4 files changed, 36 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b01b21..6ef0c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zaqar-2014.2.b3.tar.gz
+/zaqar-2014.2.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-PBR.patch b/0001-Remove-runtime-dependency-on-PBR.patch
index cd6eb4f..3ece606 100644
--- a/0001-Remove-runtime-dependency-on-PBR.patch
+++ b/0001-Remove-runtime-dependency-on-PBR.patch
@@ -1,20 +1,29 @@
---- zaqar-2014.2.dev98.g89aa8d0-orig/zaqar/version.py	2014-09-01 20:36:53.682000000 -0430
-+++ zaqar-2014.2.dev98.g89aa8d0/zaqar/version.py	2014-09-01 20:43:39.133000000 -0430
-@@ -13,11 +13,30 @@
+From 7a27036f3ba845fed70fc11fbe25c841d8fd1e91 Mon Sep 17 00:00:00 2001
+From: Jon Bernard <jbernard at tuxion.com>
+Date: Tue, 22 Apr 2014 13:16:29 -0400
+Subject: [PATCH] Remove runtime dependency on PBR
+
+---
+ zaqar/version.py | 24 +++++++++++++++++++++---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/zaqar/version.py b/zaqar/version.py
+index fbcdb67..8038ba1 100644
+--- a/zaqar/version.py
++++ b/zaqar/version.py
+@@ -13,11 +13,29 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
 -import pbr.packaging
 -import pbr.version
-+ZAQAR_VENDOR = "Openstack Foundation"
-+ZAQAR_PRODUCT = "Openstack Zaqar"
-+ZAQAR_PACKAGE = None # Os distro package version suffix
  
+ 
+-version_info = pbr.version.VersionInfo('zaqar')
 +class VersionInfo(object):
 +    release = "REDHATRELEASE"
 +    version = "REDHATVERSION"
- 
--version_info = pbr.version.VersionInfo('zaqar')
++
 +    def version_string(self):
 +        return self.version
 +
@@ -30,6 +39,7 @@
 +    def version_string_with_vcs(self):
 +        return self.release
 +
++
 +version_info = VersionInfo()
  
  
diff --git a/openstack-zaqar.spec b/openstack-zaqar.spec
index 63457f9..e7ca4ec 100644
--- a/openstack-zaqar.spec
+++ b/openstack-zaqar.spec
@@ -1,26 +1,30 @@
 %global project zaqar
 Name:           openstack-%{project}
 Version:        2014.2
-Release:        0.3.b3%{?dist}
+Release:        1%{?dist}
 Summary:        Message queuing service for OpenStack
 
 Group:          Applications/System
 License:        ASL 2.0
 URL:            https://wiki.openstack.org/wiki/Zaqar
-Source0:        http://tarballs.openstack.org/zaqar/%{project}-%{version}.b3.tar.gz
+Source0:        http://tarballs.openstack.org/zaqar/%{project}-%{version}.tar.gz
 Source1:        %{project}-dist.conf
 
 Source10:       %{name}.service
 Source11:       %{name}.logrotate
 
+#
+# patches_base=2014.2
+#
 Patch0001: 0001-Remove-runtime-dependency-on-PBR.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
-BuildRequires:  systemd
 BuildRequires:  python-setuptools
 BuildRequires:  python-pbr
 BuildRequires:  openstack-utils
+BuildRequires:  systemd
+BuildRequires:  git
 
 Obsoletes:      openstack-marconi < 2014.1-2.2
 
@@ -57,8 +61,8 @@ Users will be able to customize Zaqar to achieve a wide range of performance,
 durability, availability,and efficiency goals
 
 %prep
-%setup -q -n %{project}-%{version}.b3
-%patch0001 -p1
+%autosetup -n %{project}-%{version} -S git
+
 sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{project}/version.py
 
 # Remove the requirements file so that pbr hooks don't add it
@@ -128,7 +132,9 @@ exit 0
 %systemd_postun_with_restart openstack-zaqar.service
 
 %files
-%doc LICENSE README.rst
+%{!?_licensedir: %global license %%doc}
+%license LICENSE
+%doc README.rst
 
 %dir %{_sysconfdir}/%{project}
 %config(noreplace) %attr(0640, root, %{project}) %{_sysconfdir}/%{project}/%{project}.conf
@@ -153,7 +159,10 @@ exit 0
 %{python_sitelib}/%{project}-%{version}*.egg-info
 
 %changelog
-* Sun Sep 10 2014 Eduardo Echeverria <echevemaster at gmail.com> 2014.2-0.3.b3
+* Sun Oct 19 2014 Haïkel Guémar <hguemar at fedoraproject.org> 2014.2-1
+- Update to upstream 2014.2
+
+* Sun Sep 07 2014 Eduardo Echeverria <echevemaster at gmail.com> 2014.2-0.3.b3
 - Adding missing requires
 
 * Sun Sep 07 2014 Eduardo Echeverria <echevemaster at gmail.com> 2014.2-0.2.b3
diff --git a/sources b/sources
index b85a832..f626278 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aff68e04a22994464866ed6a5c0e7a76  zaqar-2014.2.b3.tar.gz
+8375462563ed0abbc55a83052083c325  zaqar-2014.2.tar.gz