diff --git a/gutenprint-test-suite.patch b/gutenprint-test-suite.patch new file mode 100644 index 0000000..aca3c4c --- /dev/null +++ b/gutenprint-test-suite.patch @@ -0,0 +1,12 @@ +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 23ec467..3517a7b 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -3,7 +3,7 @@ Name: gutenprint Summary: Printer Drivers Package Version: 5.2.9 -Release: 12%{?dist} +Release: 13%{?dist} Group: System Environment/Base URL: http://gimp-print.sourceforge.net/ Source0: http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2 @@ -19,6 +19,7 @@ Patch4: gutenprint-device-ids.patch Patch5: gutenprint-ui2-libdeps.patch Patch6: gutenprint-yyin.patch Patch7: gutenprint-manpage.patch +Patch8: gutenprint-test-suite.patch License: GPLv2+ BuildRequires: cups-libs, cups-devel, cups @@ -191,6 +192,9 @@ Epson, HP and compatible printers. # Added some escputil options to the manpage (bug #979064). %patch7 -p1 -b .manpage +# Fix the test suite. +%patch8 -p1 -b .test-suite + cp %{SOURCE2} src/cups/cups-genppdupdate.in %build @@ -200,6 +204,9 @@ cp %{SOURCE2} src/cups/cups-genppdupdate.in mkdir m4local autoreconf --verbose --force --install +# Don't run the weave test as it takes a very long time. +sed -i -e 's,^\(TESTS *=.*\) run-weavetest,\1,' test/Makefile.in + %configure --disable-static --disable-dependency-tracking \ --with-foomatic --with-ghostscript \ --enable-samples --enable-escputil \ @@ -209,6 +216,9 @@ autoreconf --verbose --force --install --enable-simplified-cups-ppds make %{?_smp_mflags} + +%check +make check %install make DESTDIR=%{buildroot} install @@ -314,6 +324,9 @@ fi /bin/rm -f /var/cache/foomatic/* %changelog +* Tue Jul 16 2013 Tim Waugh - 5.2.9-13 +- Run test suite. + * Thu Jun 27 2013 Tim Waugh - 5.2.9-12 - Fixed changelog dates. - Added some escputil options to the manpage (bug #979064).