From c5868a3e873994bd790312340632dacec6103b57 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Jun 13 2017 13:18:06 +0000
Subject: Update to 1.17.0


---

diff --git a/Changelog.old b/Changelog.old
index e6021ee..e1b0858 100644
--- a/Changelog.old
+++ b/Changelog.old
@@ -1,3 +1,12 @@
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-2
+- Rebuild for Python 3.6
+
+* Wed Sep 07 2016 Haikel Guemar <hguemar@fedoraproject.org> 1.14.0-1
+- Update to 1.14.0
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-2
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/python-oslo-cache.spec b/python-oslo-cache.spec
index 053cd4f..9d250c4 100644
--- a/python-oslo-cache.spec
+++ b/python-oslo-cache.spec
@@ -7,13 +7,13 @@
 %global pkg_name oslo-cache
 
 Name:           python-oslo-cache
-Version:        1.14.0
-Release:        3%{?dist}
+Version:        1.17.0
+Release:        1%{?dist}
 Summary:        Cache storage for Openstack projects
 
 License:        ASL 2.0
 URL:            http://launchpad.net/oslo
-Source0:        https://pypi.io/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz
 BuildArch:      noarch
  
 
@@ -34,6 +34,8 @@ BuildRequires:  python-mock
 BuildRequires:  python-oslotest
 BuildRequires:  python-memcached
 BuildRequires:  python-pymongo
+# Required to compile translation files
+BuildRequires:  python-babel
 
 Requires:       python-babel
 Requires:       python-dogpile-cache >= 0.6.1
@@ -43,6 +45,7 @@ Requires:       python-oslo-i18n
 Requires:       python-oslo-log
 Requires:       python-oslo-utils
 Requires:       python-memcached
+Requires:       python-%{pkg_name}-lang = %{version}-%{release}
 
 
 %description -n python2-%{pkg_name}
@@ -97,6 +100,7 @@ Requires:       python3-oslo-i18n
 Requires:       python3-oslo-log
 Requires:       python3-oslo-utils
 Requires:       python3-memcached
+Requires:       python-%{pkg_name}-lang = %{version}-%{release}
 
 %description -n python3-%{pkg_name}
 oslo.cache aims to provide a generic caching mechanism for OpenStack projects 
@@ -117,6 +121,12 @@ Requires:  python3-pymongo
 Tests for the OpenStack Oslo Cache library
 %endif
 
+%package  -n python-%{pkg_name}-lang
+Summary:   Translation files for Oslo cache library
+
+%description -n python-%{pkg_name}-lang
+Translation files for Oslo cache library
+
 %description
 oslo.cache aims to provide a generic caching mechanism for OpenStack projects 
 by wrapping the dogpile.cache library. The dogpile.cache library provides
@@ -125,7 +135,7 @@ backends such as Memcached.
 
 
 %prep
-%setup -q -n %{pypi_name}-%{upstream_version}
+%autosetup -n %{pypi_name}-%{upstream_version} -S git
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
@@ -146,6 +156,8 @@ sphinx-build -b html -d build/doctrees   source build/html
 popd
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.buildinfo
+# Generate i18n files
+%{__python2} setup.py compile_catalog -d build/lib/oslo_cache/locale
 
 %install
 %py2_install
@@ -154,6 +166,18 @@ rm -fr doc/build/html/.buildinfo
 %endif
 dos2unix doc/build/html/_static/jquery.js
 
+# Install i18n .mo files (.po and .pot are not required)
+install -d -m 755 %{buildroot}%{_datadir}
+rm -f %{buildroot}%{python2_sitelib}/oslo_cache/locale/*/LC_*/oslo_cache*po
+rm -f %{buildroot}%{python2_sitelib}/oslo_cache/locale/*pot
+mv %{buildroot}%{python2_sitelib}/oslo_cache/locale %{buildroot}%{_datadir}/locale
+%if 0%{?with_python3}
+rm -rf %{buildroot}%{python3_sitelib}/oslo_cache/locale
+%endif
+
+# Find language files
+%find_lang oslo_cache --all-name
+
 %check
 %{__python2} setup.py test
 %if 0%{?with_python3}
@@ -175,6 +199,9 @@ rm -rf .testrepository
 %files -n python2-%{pkg_name}-tests
 %{python2_sitelib}/oslo_cache/tests
 
+%files -n python-%{pkg_name}-lang -f oslo_cache.lang
+%license LICENSE
+
 %if 0%{?with_python3}
 %files -n python3-%{pkg_name}
 %license LICENSE
@@ -188,12 +215,6 @@ rm -rf .testrepository
 %endif
 
 %changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-2
-- Rebuild for Python 3.6
-
-* Wed Sep 07 2016 Haikel Guemar <hguemar@fedoraproject.org> 1.14.0-1
-- Update to 1.14.0
+* Wed Feb 08 2017 Alfredo Moralejo <amoralej@redhat.com> 1.17.0-1
+- Update to 1.17.0