Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-03-28 16:21:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-03-27 09:30:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-03-28 16:21:03.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 27 16:03:44 CET 2014 - jsm...@suse.de + +- Provide foomatic-filters with the exact foomatic-rip version + that is included in cups-filters and conflict with any other + foomatic-filters version (bnc#870621). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.8PVPfb/_old 2014-03-28 16:21:03.000000000 +0100 +++ /var/tmp/diff_new_pack.8PVPfb/_new 2014-03-28 16:21:03.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Summary: OpenPrinting CUPS filters, backends, and cups-browsed License: GPL-2.0 and GPL-2.0+ and GPL-3.0 and MIT Group: Hardware/Printing @@ -47,6 +46,16 @@ # plus the fix for https://bugs.linuxfoundation.org/show_bug.cgi?id=1187 # "cups-browsed must percent-encode component parts of the CUPS device-URI": Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{tarball_version}.tar.gz +# Since cups-filters version 1.0.42 foomatic-rip is also provided by cups-filters. +# The foomatic-rip version that is provided by cups-filters is not specified in the cups-filters sources +# but on http://www.openprinting.org/download/foomatic/ the foomatic-filters-4.0-current.tar.gz +# dated 27-Mar-2014 (i.e. from today as of this writing) contains a VERSION.full file that reads "4.0.17.256" +# so that foomatic_rip_version (macro name can be only alphanumeric and '_' i.e. "foomatic-rip_version" does not work) +# is defined here accordingly but with one more additional trailing number '.1' to ensure that +# the sub-package cups-filters-foomatic-rip (see below) conflicts with any foomatic-filters package: +# zypper vcmp '4.0.17.256' '4.0.17.256.1' -> 4.0.17.256 is older than 4.0.17.256.1 +# zypper vcmp '4.0.17.257' '4.0.17.256.1' -> 4.0.17.257 is newer than 4.0.17.256.1 +%define foomatic_rip_version 4.0.17.256.1 BuildRequires: cups-devel BuildRequires: pkgconfig # pdftopdf @@ -154,11 +163,15 @@ %package foomatic-rip Summary: OpenPrinting CUPS filter foomatic-rip Group: Hardware/Printing -# Conflict with foomatic-filters because -# the following files are provided by it +# Provide foomatic-filters with the exact foomatic_rip_version +# see https://bugzilla.novell.com/show_bug.cgi?id=870621 +# and conflict with any other foomatic-filters version because +# the following files are also provided by foomatic-filters # /usr/lib/cups/filter/foomatic-rip # /usr/share/man/man1/foomatic-rip -Conflicts: foomatic-filters +Conflicts: foomatic-filters < %{foomatic_rip_version} +Provides: foomatic-filters = %{foomatic_rip_version} +Conflicts: foomatic-filters > %{foomatic_rip_version} %description foomatic-rip Since cups-filters version 1.0.42 foomatic-rip is also @@ -192,9 +205,9 @@ # and then it is probably worth submitting an upstream issue report to # https://bugs.linuxfoundation.org for "Product: OpenPrinting" and "Component: cups-filters" ./autogen.sh -# Set our preferred architecture-specific flags for the compiler and linker: -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" +# No need to set our preferred architecture-specific flags for the compiler and linker +# via export CFLAGS="$RPM_OPT_FLAGS" and export CXXFLAGS="$RPM_OPT_FLAGS" +# because the RPM macro configure does that. # --with-pdftops=pdftops - use Poppler instead of Ghostscript (see README) %configure --disable-static \ --disable-silent-rules \ @@ -205,10 +218,14 @@ --without-php \ --with-rcdir=no \ --with-test-font-path=/usr/share/fonts/truetype/DejaVuSans.ttf -make %{?_smp_mflags} +# At least for now - until an expert may have had a look - using plain make +# instead of make with _smp_mflags because that caused sometimes strange build failures: +make %check -make check %{?_smp_mflags} +# At least for now - until an expert may have had a look - using plain make +# instead of make with _smp_mflags because that caused sometimes strange build failures: +make check %install make install DESTDIR=%{buildroot} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
