rpms
/
python-productmd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into epel7

This commit is contained in:
Adam Williamson 2017-02-10 18:37:06 -08:00
parent e490ff0b39 dd92b3a9db
commit 87697814ba
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
python-productmd.spec
View File

@ -1,14 +1,18 @@
%global with_python3 1 # Enable Python 3 builds for Fedora + EPEL >5
%if 0%{?fedora} || 0%{?rhel} > 5
%if 0%{?fedora} && 0%{?fedora} <= 12 # If the definition isn't available for python3_pkgversion, define it
%global with_python3 0 %{?!python3_pkgversion:%global python3_pkgversion 3}
%bcond_without python3
%else
%bcond_with python3
%endif %endif
%if 0%{?rhel} && 0%{?rhel} <= 7 # compatibility with older releases
%{!?__python2: %global __python2 /usr/bin/python2} %{!?__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_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%global with_python3 0 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif %{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
# compatibility with older releases # compatibility with older releases
%{!?__python2: %global __python2 /usr/bin/python2} %{!?__python2: %global __python2 /usr/bin/python2}
@ -19,7 +23,7 @@
Name: python-productmd Name: python-productmd
Version: 1.4 Version: 1.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: Library providing parsers for metadata related to OS installation Summary: Library providing parsers for metadata related to OS installation
Group: Development/Tools Group: Development/Tools
@ -38,9 +42,9 @@ BuildRequires: python-setuptools
BuildRequires: python-six BuildRequires: python-six
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python3-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python3-six BuildRequires: python%{python3_pkgversion}-six
%endif %endif
BuildArch: noarch BuildArch: noarch
@ -50,12 +54,12 @@ Python library providing parsers for metadata related to composes
and installation media. and installation media.
%if 0%{?with_python3} %if 0%{?with_python3}
%package -n python3-productmd %package -n python%{python3_pkgversion}-productmd
Summary: Library providing parsers for metadata related to OS installation Summary: Library providing parsers for metadata related to OS installation
Group: Development/Tools Group: Development/Tools
Requires: python3-six Requires: python%{python3_pkgversion}-six
%description -n python3-productmd %description -n python%{python3_pkgversion}-productmd
Python library providing parsers for metadata related to composes Python library providing parsers for metadata related to composes
and installation media. and installation media.
%endif %endif
@ -95,7 +99,7 @@ and installation media.
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python3-productmd %files -n python%{python3_pkgversion}-productmd
%license LICENSE %license LICENSE
%doc AUTHORS %doc AUTHORS
%{python3_sitelib}/productmd/ %{python3_sitelib}/productmd/
@ -103,6 +107,9 @@ and installation media.
%endif %endif
%changelog %changelog
* Fri Feb 10 2017 Adam Williamson <awilliam@redhat.com> - 1.4-2
- Enable Python 3 build for EL 6+
* Tue Jan 10 2017 Lubomír Sedlář <lsedlar@redhat.com> 1.4-1 * Tue Jan 10 2017 Lubomír Sedlář <lsedlar@redhat.com> 1.4-1
- Fix loading variants from legacy composeinfo. (dmach@redhat.com) - Fix loading variants from legacy composeinfo. (dmach@redhat.com)
- Fix sorting composes (lsedlar@redhat.com) - Fix sorting composes (lsedlar@redhat.com)