[packages/python-lockfile] adapter (still tabs); fix missing bcond on files

glen glen at pld-linux.org
Mon Sep 19 19:00:32 CEST 2016


commit 4117eb96ba19914bbde58003928bd775ad4a1ea9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Sep 19 20:00:08 2016 +0300

    adapter (still tabs); fix missing bcond on files

 python-lockfile.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/python-lockfile.spec b/python-lockfile.spec
index a130576..098c56e 100644
--- a/python-lockfile.spec
+++ b/python-lockfile.spec
@@ -1,4 +1,5 @@
-
+#
+# Conditional build:
 %bcond_without  python2 # CPython 2.x module
 %bcond_without  python3 # CPython 3.x module
 
@@ -15,12 +16,12 @@ URL:		http://pypi.python.org/pypi/lockfile
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.710
 %if %{with python2}
-BuildRequires:	python-setuptools
 BuildRequires:	python-pbr
+BuildRequires:	python-setuptools
 %endif
 %if %{with python3}
-BuildRequires:	python3-setuptools
 BuildRequires:	python3-pbr
+BuildRequires:	python3-setuptools
 %endif
 Requires:	python-modules
 BuildArch:	noarch
@@ -39,8 +40,8 @@ production-quality code.
 
 %package -n python3-%{module}
 Summary:	Exports a LockFile class which provides a simple API for locking files
-Group:          Libraries/Python
-Requires:       python3-modules
+Group:		Libraries/Python
+Requires:	python3-modules
 
 %description -n python3-%{module}
 The lockfile package exports a LockFile class which provides a simple
@@ -85,17 +86,19 @@ export PBR_VERSION=$(rpm -q --qf '%{VERSION}' python3-pbr)
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc ACKS README.rst RELEASE-NOTES
 %dir %{py_sitescriptdir}/lockfile
 %{py_sitescriptdir}/lockfile/*.py[co]
-%if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/lockfile-*.egg-info
 %endif
 
+%if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
 %doc ACKS README.rst RELEASE-NOTES
 %{py3_sitescriptdir}/lockfile
 %{py3_sitescriptdir}/lockfile-*.egg-info
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-lockfile.git/commitdiff/4117eb96ba19914bbde58003928bd775ad4a1ea9



More information about the pld-cvs-commit mailing list