diff --git a/.gitignore b/.gitignore index ec9cc2f..5ab1d22 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ gutenprint-5.2.6.tar.bz2 /gutenprint-5.2.10-pre1.tar.bz2 /gutenprint-5.2.10-pre2.tar.bz2 /gutenprint-5.2.10.tar.bz2 +/gutenprint-5.2.11-pre2.tar.bz2 diff --git a/gutenprint-test-suite.patch b/gutenprint-test-suite.patch deleted file mode 100644 index aca3c4c..0000000 --- a/gutenprint-test-suite.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gutenprint-5.2.9/src/cups/test-ppds.test-suite gutenprint-5.2.9/src/cups/test-ppds ---- gutenprint-5.2.9/src/cups/test-ppds.test-suite 2013-07-16 16:38:26.625593051 +0100 -+++ gutenprint-5.2.9/src/cups/test-ppds 2013-07-16 16:38:47.377893363 +0100 -@@ -8,7 +8,7 @@ make EXTRA_GENPPD_OPTS=-b ppd-clean ppd- - # Also, a number of our media sizes aren't named correctly, but we'll - # accept those issues rather than cluttering the namespace further and/or - # changing tag names. --cupstestppdopts='-I profiles -W sizes' -+cupstestppdopts='-I profiles -W sizes -I filters' - - ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l` - diff --git a/gutenprint.spec b/gutenprint.spec index ae17535..33c00ff 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -1,11 +1,14 @@ %global build_with_ijs_support 1 +%global prever pre2 +%global VERSION %{version}-%{prever} + Name: gutenprint Summary: Printer Drivers Package -Version: 5.2.10 -Release: 15%{?dist} +Version: 5.2.11 +Release: 0.2%{prever}%{?dist} URL: http://gimp-print.sourceforge.net/ -Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{VERSION}.tar.bz2 # Post-install script to update foomatic PPDs. Source1: gutenprint-foomaticppdupdate Source2: gutenprint-foomaticppdupdate.8 @@ -17,7 +20,6 @@ Patch2: gutenprint-selinux.patch Patch3: gutenprint-postscriptdriver.patch Patch4: gutenprint-yyin.patch Patch5: gutenprint-manpage.patch -Patch6: gutenprint-test-suite.patch License: GPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -117,7 +119,7 @@ This package contains native CUPS support for a wide range of Canon, Epson, HP and compatible printers. %prep -%setup -q +%setup -q -n gutenprint-%{VERSION} # Fix menu placement of GIMP plugin. %patch0 -p1 -b .menu # Don't use -O6 compiler option. @@ -134,9 +136,6 @@ Epson, HP and compatible printers. # Added some escputil options to the manpage (bug #979064). %patch5 -p1 -b .manpage -# Fix the test suite. -%patch6 -p1 -b .test-suite - cp %{SOURCE3} src/cups/cups-genppdupdate.in %build @@ -283,6 +282,12 @@ fi /bin/rm -f /var/cache/foomatic/* %changelog +* Tue Oct 06 2015 Jiri Popelka - 5.2.11-0.2pre2 +- 5.2.11-pre2 + +* Tue Jun 30 2015 Jiri Popelka - 5.2.11-0.1pre1 +- 5.2.11-pre1 + * Mon Jun 29 2015 Tim Waugh - 5.2.10-15 - Fix for PPD update script with more than one PPD (bug #1229619). diff --git a/sources b/sources index 3beb6fb..8dceeb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ff027103bafac419c37e19da75163ae gutenprint-5.2.10.tar.bz2 +41aeedfade32adb86c7ac376ca8892e2 gutenprint-5.2.11-pre2.tar.bz2