diff --git a/.gitignore b/.gitignore index 2bee935..c875f87 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /devscripts_2.15.4.tar.xz /devscripts_2.15.5.tar.xz /devscripts_2.15.6.tar.xz +/devscripts_2.15.7.tar.xz diff --git a/devscripts.spec b/devscripts.spec index 9a9aba4..8744149 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,6 +1,6 @@ Name: devscripts -Version: 2.15.6 -Release: 2%{?dist} +Version: 2.15.7 +Release: 1%{?dist} Summary: Scripts for Debian Package maintainers License: GPLv2+ @@ -12,8 +12,6 @@ Patch0: devscripts_docbook.patch Patch1: devscripts_install-layout.patch # Install some additional man pages Patch2: devscripts_install-man.patch -# Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file -Patch3: devscripts_licensecheck.patch # rpmdevtools < 8.4 bundled some of the scripts provided by this package Conflicts: rpmdevtools < 8.4 @@ -110,7 +108,7 @@ This package contains the following subset of the devscripts scripts: %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 + %build make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" @@ -162,6 +160,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc %changelog +* Sat Aug 01 2015 Sandro Mani - 2.15.7-1 +- Update to 2.15.7 + * Sat Aug 01 2015 Sandro Mani - 2.15.6-2 - Fix licensecheck incorrectly detecting mime strings such as text/x-c++ as a binary file (#1249227) diff --git a/devscripts_licensecheck.patch b/devscripts_licensecheck.patch deleted file mode 100644 index 0beabab..0000000 --- a/devscripts_licensecheck.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN devscripts-2.15.6/scripts/licensecheck.pl devscripts-2.15.6-new/scripts/licensecheck.pl ---- devscripts-2.15.6/scripts/licensecheck.pl 2015-07-28 05:15:12.000000000 +0200 -+++ devscripts-2.15.6-new/scripts/licensecheck.pl 2015-08-01 00:02:21.376875372 +0200 -@@ -323,7 +323,7 @@ while (@files) { - # Encode::Guess does not work well, use good old file command to get file encoding - my $mime = `file --brief --mime --dereference $file`; - my $charset ; -- if ($mime =~ m!(?:text/[\w-]+|application/xml); charset=([\w-]+)!) { -+ if ($mime =~ m!(?:text/[\w-\+]+|application/xml); charset=([\w-]+)!) { - $charset = $1; - } - else { diff --git a/sources b/sources index c705ebc..75255aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff4f0975f90c7a1ae3ae1de89df0e345 devscripts_2.15.6.tar.xz +1655e2c91e42cd48393c65726bc3faa9 devscripts_2.15.7.tar.xz