[python-xmltodict] * Thu Oct 02 2014 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.0-1 - Update spec file according g

Fabian Affolter fab at fedoraproject.org
Thu Oct 2 20:54:54 UTC 2014


commit f9ed8aa45198d85bb11b3425b635fce4943cfdba
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Thu Oct 2 22:54:36 2014 +0200

    * Thu Oct 02 2014 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.0-1
    - Update spec file according guidelines
    - Update to upstream release 0.9.0

 .gitignore            |    1 +
 python-xmltodict.spec |   45 +++++++++++++++++++++++++--------------------
 sources               |    2 +-
 3 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3af3326..ff8ddd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xmltodict-0.4.2.tar.gz
+/xmltodict-0.9.0.tar.gz
diff --git a/python-xmltodict.spec b/python-xmltodict.spec
index f5cc0a2..8e5267f 100644
--- a/python-xmltodict.spec
+++ b/python-xmltodict.spec
@@ -1,21 +1,23 @@
 %if 0%{?fedora} > 12
 %global with_python3 1
 %{!?py3ver: %global py3ver %(%{__python3} -c "import sys ; print(sys.version[:3])")}
+%else
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%{!?py2ver: %global py2ver %(%{__python2} -c "import sys ; print sys.version[:3]")}
 %endif
-%{!?py2ver: %global py2ver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
-
-%global modname xmltodict
+%global srcname xmltodict
 
 Name:               python-xmltodict
-Version:            0.4.2
-Release:            5%{?dist}
+Version:            0.9.0
+Release:            1%{?dist}
 Summary:            Makes working with XML feel like you are working with JSON
 
 Group:              Development/Libraries
 License:            MIT
-URL:                http://pypi.python.org/pypi/xmltodict
-Source0:            http://pypi.python.org/packages/source/x/%{modname}/%{modname}-%{version}.tar.gz
+URL:                https://github.com/martinblech/xmltodict
+Source0:            http://pypi.python.org/packages/source/x/%{srcname}/%{srcname}-%{version}.tar.gz
 
 BuildArch:          noarch
 
@@ -60,7 +62,7 @@ Wikipedia.
 Summary:            Makes working with XML feel like you are working with JSON
 Group:              Development/Libraries
 
-Requires:   python3
+Requires:           python3
 
 %description -n python3-xmltodict
 xmltodict is a Python module that makes working with XML feel like you are
@@ -91,31 +93,30 @@ Wikipedia.
 %endif
 
 %prep
-%setup -q -n %{modname}-%{version}
-
-# Remove bundled egg-info in case it exists
-rm -rf %{modname}.egg-info
+%setup -q -n %{srcname}-%{version}
+rm -rf %{srcname}.egg-info
+find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|'
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
 %endif
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py build
 popd
 %endif
 
-
 %install
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
 popd
 %endif
-%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
 
 %check
 nosetests-%{py2ver}
@@ -127,18 +128,22 @@ popd
 
 %files
 %doc README.md LICENSE PKG-INFO
-%{python_sitelib}/%{modname}.py*
-%{python_sitelib}/%{modname}-%{version}*
+%{python_sitelib}/%{srcname}.py*
+%{python_sitelib}/%{srcname}-%{version}*
 
 %if 0%{?with_python3}
 %files -n python3-xmltodict
 %doc README.md LICENSE PKG-INFO
-%{python3_sitelib}/%{modname}.py
-%{python3_sitelib}/%{modname}-%{version}-*
-%{python3_sitelib}/__pycache__/%{modname}*
+%{python3_sitelib}/%{srcname}.py
+%{python3_sitelib}/%{srcname}-%{version}-*
+%{python3_sitelib}/__pycache__/%{srcname}*
 %endif
 
 %changelog
+* Thu Oct 02 2014 Fabian Affolter <mail at fabian-affolter.ch> - 0.9.0-1
+- Update spec file according guidelines 
+- Update to upstream release 0.9.0
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 2252d45..8578b8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29e60a42a3df1694b7456b8245184650  xmltodict-0.4.2.tar.gz
+3dee8f1a5172315119051a3854596244  xmltodict-0.9.0.tar.gz


More information about the scm-commits mailing list