mburns72h pushed to os-apply-config (master). "update to upstream 0.1.30"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue May 12 12:25:55 UTC 2015


From 2b03b60d3d7c4e938429f75ba310d5b37c8d43ac Mon Sep 17 00:00:00 2001
From: Mike Burns <mburns at redhat.com>
Date: Tue, 12 May 2015 08:24:35 -0400
Subject: update to upstream 0.1.30


diff --git a/.gitignore b/.gitignore
index e798021..dcafdfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /os-apply-config-0.1.16.tar.gz
 /os-apply-config-0.1.21.tar.gz
 /os-apply-config-0.1.23.tar.gz
+/os-apply-config-0.1.30.tar.gz
diff --git a/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch b/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
deleted file mode 100644
index d335ef9..0000000
--- a/0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 97c80e875d9a0d77fac292f892dc91ac909feb0a Mon Sep 17 00:00:00 2001
-From: Steven Dake <sdake at redhat.com>
-Date: Mon, 24 Feb 2014 10:12:02 -0700
-Subject: [PATCH] Remove pbr runtime dependency and replace with build time
- calculation
-
-Requires some sed operation on REDHATOSAPPLYCONFIGVERSION and
-REDHATOSAPPLYCONFIGRELEASE to runtime modify the package.
----
- os_apply_config/version.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/os_apply_config/version.py b/os_apply_config/version.py
-index d4af00b..fc30ea5 100644
---- a/os_apply_config/version.py
-+++ b/os_apply_config/version.py
-@@ -13,6 +13,15 @@
- #    under the License.
- 
- 
--import pbr.version
-+class VersionInfo(object):
-+    release = "REDHATOAPPLCONFIGRELEASE"
-+    version = "REDHATOSAPPLYCONFIGVERSION"
- 
--version_info = pbr.version.VersionInfo('os-apply-config')
-+    def version_string(self):
-+        return self.version
-+
-+    def release_string(self):
-+        return self.release
-+
-+version_info = VersionInfo()
-+version_string = version_info.version_string
diff --git a/os-apply-config.spec b/os-apply-config.spec
index 3f71b0e..febc0f9 100644
--- a/os-apply-config.spec
+++ b/os-apply-config.spec
@@ -1,13 +1,15 @@
 Name:		os-apply-config
-Version:	0.1.23
-Release:	1%{?dist}
+Version:	0.1.30
+Release:	2%{?dist}
 Summary:	Configure files from cloud metadata
 
 License:	ASL 2.0
 URL:		http://pypi.python.org/pypi/%{name}
 Source0:	http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
-Patch0001: 0001-Remove-pbr-runtime-dependency-and-replace-with-build.patch
+#
+# patches_base=+1
+#
 
 BuildArch:	noarch
 BuildRequires:	python2-devel
@@ -22,15 +24,11 @@ Requires:	pystache
 %description
 Tool to apply openstack heat metadata to files on the system.
 
-#
-# patches_base: 0.1.16
-#
 
 %prep
 
 %setup -q -n %{name}-%{version}
 
-%patch0001 -p1
 
 sed -i '/setuptools_git/d' setup.py
 sed -i s/REDHATOSAPPLYCONFIGVERSION/%{version}/ os_apply_config/version.py
@@ -51,6 +49,12 @@ sed -i s/REDHATOSAPPLYCONFIGRELEASE/%{release}/ os_apply_config/version.py
 %{python_sitelib}/os_apply_config*
 
 %changelog
+* Mon May 11 2015 Mike Burns <mburns at redhat.com> 0.1.30-2
+- RHOS: use internal gerrit
+
+* Thu May 07 2015 Mike Burns <mburns at redhat.com> 0.1.30-1
+- Update to upstream 0.1.30
+
 * Tue Oct 28 2014 James Slagle <jslagle at redhat.com> 0.1.23-1
 - Update to upstream 0.1.23
 
diff --git a/sources b/sources
index 68f3f9c..24906bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4f1b9ac17d26ca23d12833a857b7d57  os-apply-config-0.1.23.tar.gz
+7dfd9ab35e97bed26cd90d6da7d1e073  os-apply-config-0.1.30.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/os-apply-config.git/commit/?h=master&id=2b03b60d3d7c4e938429f75ba310d5b37c8d43ac


More information about the scm-commits mailing list