diff --git a/.gitignore b/.gitignore index aff0a85..54a3f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pyscard-1.7.0.tar.gz /pyscard-1.9.0.tar.gz /pyscard-1.9.5.tar.gz +/pyscard-1.9.7.tar.gz diff --git a/pyscard.spec b/pyscard.spec index 7d5c749..483126c 100644 --- a/pyscard.spec +++ b/pyscard.spec @@ -1,6 +1,13 @@ +#Drop python2 on Fedora 30+ and RHEL 8+ +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%bcond_with python2 +%else +%bcond_without python2 +%endif + Name: pyscard -Version: 1.9.5 -Release: 10%{?dist} +Version: 1.9.7 +Release: 1%{?dist} Summary: A framework for building smart card aware applications in Python Group: Development/Libraries @@ -14,8 +21,6 @@ URL: https://sourceforge.net/projects/pyscard/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: python2-devel -BuildRequires: python%{python3_pkgversion}-devel BuildRequires: pcsc-lite-devel BuildRequires: swig >= 1.3.31 @@ -28,8 +33,10 @@ This is the python2 package. %description %_description +%if %{with python2} %package -n python2-%{name} Summary: %summary +BuildRequires: python2-devel Requires: pcsc-lite %{?python_provide:%python_provide python2-%{name}} # Remove before F30 @@ -38,10 +45,13 @@ Provides: pyscard%{?_isa} = %{version}-%{release} Obsoletes: pyscard < %{version}-%{release} %description -n python2-%{name} %_description +%endif %package -n python%{python3_pkgversion}-%{name} Summary: A framework for building smart card aware applications in Python +BuildRequires: python%{python3_pkgversion}-devel Requires: pcsc-lite +%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} %description -n python%{python3_pkgversion}-%{name} The pyscard smartcard library is a framework for building smart card aware @@ -50,38 +60,76 @@ Python wrapper module. This is the python3 package. +%if 0%{?python3_other_pkgversion} +%package -n python%{python3_other_pkgversion}-%{name} +Summary: A framework for building smart card aware applications in Python +BuildRequires: python%{python3_other_pkgversion}-devel +Requires: pcsc-lite +%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}} + +%description -n python%{python3_other_pkgversion}-%{name} +The pyscard smartcard library is a framework for building smart card aware +applications in Python. The smartcard module is built on top of the PCSC API +Python wrapper module. + +This is the python3 package. +%endif + %prep %setup -q # license file is CRLF terminated -- prevent a rpmlint warning #sed -i 's/\r//' LICENSE %build +%if %{with python2} %py2_build +%endif %py3_build +%if 0%{?python3_other_pkgversion} +%py3_other_build +%endif %install +%if %{with python2} %py2_install chmod 755 %{buildroot}%{python2_sitearch}/smartcard/scard/*.so +%endif %py3_install chmod 755 %{buildroot}%{python3_sitearch}/smartcard/scard/*.so +%if 0%{?python3_other_pkgversion} +%py3_other_install +%endif +%if %{with python2} %files -n python2-%{name} %license LICENSE -%doc README +%doc ACKS README.md %doc smartcard/doc/* %{python2_sitearch}/smartcard/ %{python2_sitearch}/%{name}-%{version}-py*.egg-info +%endif %files -n python%{python3_pkgversion}-%{name} %license LICENSE -%doc README +%doc ACKS README.md %doc smartcard/doc/* %{python3_sitearch}/smartcard/ %{python3_sitearch}/%{name}-%{version}-py*.egg-info +%if 0%{?python3_other_pkgversion} +%files -n python%{python3_other_pkgversion}-%{name} +%license LICENSE +%doc ACKS README.md +%doc smartcard/doc/* +%{python3_other_sitearch}/smartcard/ +%{python3_other_sitearch}/%{name}-%{version}-py*.egg-info +%endif + %changelog -* Fri Nov 16 2018 Orion Poplawski - 1.9.5-10 -- Support python3 on EPEL +* Fri Nov 16 2018 Orion Poplawski - 1.9.7-1 +- Update to 1.9.7 +- Drop python2 on Fedora 30+, RHEL 8+ (BZ# 1634871) +- Support python3 on EPEL (BZ# 1540752) * Fri Jul 13 2018 Fedora Release Engineering - 1.9.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 83d8d63..c6aa8a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyscard-1.9.5.tar.gz) = a0c5cd4ccbe8437ffd37afcf95c71f7d1d6c3ae364063cf81907095625d2062da8e7335ebfd15d1f952e8a8d9395e990b351b1308ab07fa456a7ee10658db4f9 +SHA512 (pyscard-1.9.7.tar.gz) = 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a