ralph pushed to python-cmd2 (f22). "Drop double-use of 2to3."

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 29 19:22:44 UTC 2015


>From 6d30083d24f59451ce0f28748f74de167cea8a5d Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean at redhat.com>
Date: Wed, 29 Apr 2015 15:15:59 -0400
Subject: Drop double-use of 2to3.


diff --git a/python-cmd2.spec b/python-cmd2.spec
index 5f30160..8a81cb2 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -6,7 +6,7 @@
 
 Name:             python-cmd2
 Version:          0.6.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Extra features for standard library's cmd module
 
 Group:            Development/Libraries
@@ -95,19 +95,15 @@ rm -rf %{py3dir}
 cp -a . %{py3dir}
 %endif
 
-
 %build
 %{__python} setup.py build
 
 %if 0%{?with_python3}
-/usr/bin/2to3 -w -n %{py3dir}
 pushd %{py3dir}
 %{__python3} setup.py build
 popd
 %endif
 
-
-
 %install
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -117,9 +113,8 @@ popd
 
 %{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
-
 %files
-%doc README.txt 
+%doc README.txt
 %{python_sitelib}/cmd2.py*
 %{python_sitelib}/%{modname}-%{version}*
 
@@ -129,11 +124,12 @@ popd
 %{python3_sitelib}/cmd2.py*
 %{python3_sitelib}/__pycache__/cmd2*
 %{python3_sitelib}/%{modname}-%{version}*
-
 %endif
 
-
 %changelog
+* Wed Apr 29 2015 Ralph Bean <rbean at redhat.com> - 0.6.8-2
+- Fix python3 subpackage by removing double-run of 2to3 (it's not idempotent!).
+
 * Wed Apr 29 2015 Ralph Bean <rbean at redhat.com> - 0.6.8-1
 - new version
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-cmd2.git/commit/?h=f22&id=6d30083d24f59451ce0f28748f74de167cea8a5d


More information about the scm-commits mailing list