[ProDy] Some fixes based on Python guidelines.
Antonio Trande
sagitter at fedoraproject.org
Sun Jul 13 10:02:22 UTC 2014
commit e0056363311463a462e9cadf1a71bde48c394ce2
Author: sagitter <anto.trande at gmail.com>
Date: Sun Jul 13 12:02:33 2014 +0200
Some fixes based on Python guidelines.
ProDy.spec | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/ProDy.spec b/ProDy.spec
index 8b994c7..0a64f4e 100644
--- a/ProDy.spec
+++ b/ProDy.spec
@@ -1,7 +1,10 @@
-%if 0%{?fedora}
-%global __python %{__python2}
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
+
## Filtering of private libraries
%global _privatelibs ^%{python_sitearch}/prody/.*\\.so$
%global __provides_exclude_from ^(%{_privatelibs})$
@@ -10,7 +13,7 @@
Name: ProDy
Summary: Application for protein structure, dynamics and sequence analysis
Version: 1.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+
Group: Applications/Engineering
URL: http://www.csb.pitt.edu/ProDy
@@ -34,7 +37,7 @@ Requires: python-matplotlib
%if 0%{?rhel}
Requires: python-argparse
Requires: pyparsing, python-biopython >= 1.62
-Requires: ipython
+Requires: python-ipython
%else
Requires: pyparsing, python-biopython
Requires: python-ipython
@@ -59,26 +62,22 @@ rm prody/proteins/pairwise2.py prody/proteins/cpairwise2.c
rm prody/apps/argparse.py
%build
-%{__python} setup.py build
+%{__python2} setup.py build
%install
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-
-## Fix 'non-executable-script' warnings
-#chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/prody/tests/test_*/test_*.py
-#chmod a+x $RPM_BUILD_ROOT%{python_sitearch}/prody/tests/__init__.py
-
-## Add Python shebang
-#sed -i -e '1i#!/usr/bin/python' $RPM_BUILD_ROOT%{python_sitearch}/prody/tests/test_apps/test_prody_examples.py
+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
%files
%doc *.rst PKG-INFO
%{_bindir}/prody
%{_bindir}/evol
-%{python_sitearch}/prody
-%{python_sitearch}/%{name}-%{version}-*.egg-info
+%{python2_sitearch}/prody
+%{python2_sitearch}/%{name}-%{version}-*.egg-info
%changelog
+* Sat Jul 12 2014 Antonio Trande <sagitter at fedoraproject.org> 1.5.1-3
+- Some fixes based on Python guidelines
+
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list