Merge pull request #122 from ARGOeu/devel

Version 0.5.4

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.5.4] - 2020-10-08
+
+### FIXED
+
+ARGO-2592 ams-library py2 RPM also packages py3 specific modules
+
 ## [0.5.3] - 2020-09-08
 
 ### FIXED

argo-ams-library.spec

@@ -6,7 +6,7 @@
 
 Name:           argo-ams-library
 Summary:        %{sum}
-Version:        0.5.3
+Version:        0.5.4
 Release:        1%{?dist}
 
 Group:          Development/Libraries
@@ -76,25 +76,27 @@ AutoReq: no
 
 %install
 rm -rf %{buildroot}
-%{py_install "--record=INSTALLED_FILES" }
-%{py3_install "--record=INSTALLED_FILES" }
+%{py_install "--record=INSTALLED_FILES_PY2" }
+%{py3_install "--record=INSTALLED_FILES_PY3" }
 
 
-%files -n python%{python3_pkgversion}-%{name} -f INSTALLED_FILES
+%files -n python%{python3_pkgversion}-%{name} -f INSTALLED_FILES_PY3
 %doc examples/ README.md
 %defattr(-,root,root,-)
 %{python3_sitelib}/*
 %if 0%{?el7}
-%files -n python-%{name} -f INSTALLED_FILES
+%files -n python-%{name} -f INSTALLED_FILES_PY2
 %else
-%files -n python2-%{name} -f INSTALLED_FILES
+%files -n python2-%{name} -f INSTALLED_FILES_PY2
 %endif
 %doc examples/ README.md
 %defattr(-,root,root,-)
 %{python_sitelib}/*
 
 
 %changelog
+* Thu Oct 8 2020 Daniel Vrcic <[email protected]> - 0.5.4-1%{?dist}
+- ARGO-2592 ams-library py2 RPM also packages py3 specific modules
 * Tue Sep 8 2020 Daniel Vrcic <[email protected]> - 0.5.3-1%{?dist}
 - ARGO-2530 bytes handling in Py3
 * Wed Jul 8 2020 Daniel Vrcic <[email protected]> - 0.5.2-1%{?dist}

setup.py

@@ -2,7 +2,7 @@
 from os import path
 import glob
 
-NAME='argo-ams-library'
+NAME = 'argo-ams-library'
 
 this_directory = path.abspath(path.dirname(__file__))
 with open(path.join(this_directory, 'README.md')) as f: