[gnuplot-py] Revert change in build/install, it breaks eggs

Sergio Pascual sergiopr at fedoraproject.org
Mon Nov 3 10:12:10 UTC 2014


commit b1f0ce5c2911efd864df70b23df07663150c96eb
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Mon Nov 3 11:12:14 2014 +0100

    Revert change in build/install, it breaks eggs

 gnuplot-py.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/gnuplot-py.spec b/gnuplot-py.spec
index 9b79733..ae79db9 100644
--- a/gnuplot-py.spec
+++ b/gnuplot-py.spec
@@ -1,6 +1,6 @@
 Name: gnuplot-py
 Version: 1.8
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Python interface to Gnuplot
 
 Group: Development/Languages
@@ -32,11 +32,13 @@ for F in utils.py __init__.py funcutils.py; do
 done
 chmod 644 test.py demo.py
 
+# See this http://fedoraproject.org/wiki/Packaging:Python_Eggs
+# before changing anything here
 %build
-%{__python2} setup.py build
+%{__python2} -c 'import setuptools; execfile("setup.py")' build
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%{__python2} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
 
 # These two are used by developers only, see
 # http://sourceforge.net/tracker2/?func=detail&aid=2127867&group_id=17434&atid=117434
@@ -46,9 +48,13 @@ rm %{buildroot}%{python2_sitelib}/Gnuplot/test.py*
 
 %files
 %doc ANNOUNCE.txt CREDITS.txt FAQ.txt LICENSE.txt NEWS.txt README.txt TODO.txt doc/Gnuplot test.py demo.py
-%{python2_sitelib}/*
+%{python2_sitelib}/Gnuplot
+%{python2_sitelib}/gnuplot_py-1.8-py2.7.egg-info
 
 %changelog
+* Mon Nov 03 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 1.8-18
+- Revert change in build/install, it breaks eggs
+
 * Wed Oct 29 2014 Sergio Pascual <sergiopr at fedoraproject.org> - 1.8-17
 - Patch to fix bz #1158546
 - Cleanup of old rpm macros


More information about the scm-commits mailing list