diff --git a/devscripts.spec b/devscripts.spec index 81c1166..264e168 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,6 +1,6 @@ Name: devscripts Version: 2.17.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scripts for Debian Package maintainers License: GPLv2+ @@ -12,6 +12,7 @@ Patch0: devscripts_docbook.patch Patch1: devscripts_install-layout.patch # Install some additional man pages Patch2: devscripts_install-man.patch +Patch3: devscripts_unknown_experimental.patch BuildRequires: perl BuildRequires: perl-generators @@ -67,8 +68,8 @@ BuildRequires: perl(warnings) BuildRequires: docbook-style-xsl BuildRequires: libxslt BuildRequires: po4a -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: /usr/bin/dpkg-buildflags BuildRequires: /usr/bin/dpkg-vendor BuildRequires: /usr/bin/dpkg-parsechangelog @@ -110,6 +111,7 @@ distribution release cycle, please do not reference it or depend on it in any wa %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -166,6 +168,9 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/bts # Empty %changelog +* Mon Feb 13 2017 Sérgio Basto - 2.17.1-3 +- Epel 7 fixes: python3 requires and one compile error + * Fri Feb 10 2017 Fedora Release Engineering - 2.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/devscripts_unknown_experimental.patch b/devscripts_unknown_experimental.patch new file mode 100644 index 0000000..1da3253 --- /dev/null +++ b/devscripts_unknown_experimental.patch @@ -0,0 +1,11 @@ +--- ./scripts/git-deborig.pl.orig 2017-02-13 05:18:09.031374190 +0000 ++++ ./scripts/git-deborig.pl 2017-02-13 05:18:26.316548488 +0000 +@@ -61,7 +61,7 @@ B was written by Sean Whitt + + use strict; + use warnings; +-no warnings "experimental::smartmatch"; ++no if $] >= 5.018, 'warnings', 'experimental::smartmatch'; + + use Git::Wrapper; + use Dpkg::Changelog::Parse;