From 58c9b1382ed81915be8bc9bd50781e154304dc25 Mon Sep 17 00:00:00 2001 From: aarem Date: Dec 26 2019 16:53:54 +0000 Subject: Upgrade with python3 --- diff --git a/.gitignore b/.gitignore index 842505e..8922436 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /stapler-0.3.3.tar.gz +/stapler-1.0.0.tar.bz2 diff --git a/pdf-stapler.spec b/pdf-stapler.spec index 35e87d9..abc899f 100644 --- a/pdf-stapler.spec +++ b/pdf-stapler.spec @@ -2,17 +2,17 @@ # Name: pdf-stapler -Version: 0.3.3 -Release: 15%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Tool for manipulating PDF documents from the command line License: BSD URL: https://github.com/hellerbarde/stapler -Source0: https://pypi.python.org/packages/source/s/stapler/stapler-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/s/stapler/stapler-%{version}.tar.bz2 +Source1: https://github.com/hellerbarde/stapler/archive/stapler-%{version}.tar.bz2 BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-PyPDF2 -Requires: python2-staplelib = %{version}-%{release} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3-staplelib = %{version}-%{release} %description pdf-stapler is the Fedora package for stapler, the opensource python @@ -29,12 +29,12 @@ writing his own. This version of stapler is Fred Wenzel's fork of the project, with a completely refactored source code, tests, and added functionality. -%package -n python2-staplelib +%package -n python3-staplelib Summary: Module staplelib of pdf-stapler -Requires: python2-PyPDF2 -%{?python_provide:%python_provide python2-staplelib} +Requires: python3-PyPDF2 +%{?python_provide:%python_provide python3-staplelib} -%description -n python2-staplelib +%description -n python3-staplelib %{summary}. %prep @@ -42,15 +42,13 @@ Requires: python2-PyPDF2 sed -i 's|"PyPDF2>=1.24"||' setup.py %build -%py2_build +%py3_build -# Test files needed to run tests are missing from the sources, -# see https://github.com/hellerbarde/stapler/issues/33 -#%%check -#%%{__python2} setup.py test +%check +%{__python3} setup.py test %install -%{py2_install} +%{py3_install} mv $RPM_BUILD_ROOT/%{_bindir}/stapler $RPM_BUILD_ROOT/%{_bindir}/%{name} # Fedora already has a stapler package so this "stapler" package is renamed @@ -61,20 +59,14 @@ mv $RPM_BUILD_ROOT/%{_bindir}/stapler $RPM_BUILD_ROOT/%{_bindir}/%{name} %doc README.rst PKG-INFO %license LICENSE -%files -n python2-staplelib -%{python2_sitelib}/stapler-%{version}*.egg-info -%{python2_sitelib}/staplelib/ +%files -n python3-staplelib +%{python3_sitelib}/stapler-%{version}*.egg-info +%{python3_sitelib}/staplelib/ %license LICENSE %changelog -* Fri Jul 26 2019 Fedora Release Engineering - 0.3.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.3.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.3.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Thu Dec 26 2019 aarem AT fedoraproject DOT org - 1.0.0-1 +- Rebuilt for python3, added PKG-INFO. * Mon Mar 26 2018 Iryna Shcherbina - 0.3.3-12 - Update Python 2 dependency declarations to new packaging standards diff --git a/sources b/sources index b80e7d2..3b14bc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b95ae76987133deca71e5faf1923f3 stapler-0.3.3.tar.gz +SHA512 (stapler-1.0.0.tar.bz2) = 8a3d844ee7d41e70fd064c1145f70202efabc240e3be3dba6cb5601b33d7f202ee1d13ed602cdf0d6c385f3d86f71d88f17876339fc313ed820d4f028c7fe397