Hello community, here is the log from the commit of package gutenprint for openSUSE:Factory checked in at 2015-03-29 20:16:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gutenprint (Old) and /work/SRC/openSUSE:Factory/.gutenprint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gutenprint" Changes: -------- --- /work/SRC/openSUSE:Factory/gutenprint/gutenprint.changes 2014-06-18 10:59:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gutenprint.new/gutenprint.changes 2015-03-29 20:16:18.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 18 16:53:46 CET 2015 - jsm...@suse.de + +- Make it build for SLE12 with traditional CUPS 1.5.4 to ensure + it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4 because + for SLE12 by default CUPS 1.7.5 is provided and alternatively + CUPS 1.5.4 is provided in the "legacy" module, cf. + https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/ + +------------------------------------------------------------------- +Tue Mar 17 09:21:54 CET 2015 - jsm...@suse.de + +- To make it build on SLE11 it BuildRequires cupsddk because + on SLE11 with its CUPS 1.3.9 there is the separated package + cupsddk (otherwise it is cups-ddk a sub-package of cups). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gutenprint.spec ++++++ --- /var/tmp/diff_new_pack.tZdMuH/_old 2015-03-29 20:16:18.000000000 +0200 +++ /var/tmp/diff_new_pack.tZdMuH/_new 2015-03-29 20:16:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gutenprint # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,25 @@ Release: 0 %define gutenprintmajor 5.2 BuildRequires: cairo-devel +# SLE11 and SLE12 need special BuildRequires. +# For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto +%if 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315 +# Anything what is not SLE11 or SLE12 (i.e. all openSUSE versions) have "normal" BuildRequires. BuildRequires: cups-ddk BuildRequires: cups-devel +%endif +%if 0%{?suse_version} == 1110 +# On SLE11 with its CUPS 1.3.9 there is the separated package cupsddk. +BuildRequires: cups-devel +BuildRequires: cupsddk +%endif +%if 0%{?suse_version} == 1315 +# For SLE12 by default CUPS 1.7.5 is provided and alternatively CUPS 1.5.4 is provided in the "legacy" module. +# For SLE12 build it with traditional CUPS 1.5.4 to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4. +# Only in the Printing project for SLE12 use cups154-ddk (a sub package of the cups154-SLE12 source package): +BuildRequires: cups154-ddk +BuildRequires: cups154-devel +%endif BuildRequires: gimp-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -125,7 +142,9 @@ make DESTDIR=$RPM_BUILD_ROOT install # Work with upstream compliant CUPS 1.4 on all platforms # which means to have a fixed "/usr/lib/cups/" directory -# on all platforms (see Novell/Suse Bugzilla bnc#575544): +# on all platforms (see Novell/Suse Bugzilla bnc#575544). +# Do not do this for SLE11 with its CUPS 1.3.9 where still /usr/lib64/cups/ is used on x86_64: +%if 0%{?suse_version} > 1110 for D in lib32 lib64 do for F in commandtocanon commandtoepson rastertogutenprint.%{gutenprintmajor} do if test -e $RPM_BUILD_ROOT/usr/$D/cups/filter/$F @@ -137,12 +156,18 @@ then mv -f $RPM_BUILD_ROOT/usr/$D/cups/driver/$F $RPM_BUILD_ROOT/usr/lib/cups/driver/$F fi done +%endif # Disable the run-time PPD generator /usr/lib/cups/driver/gutenprint.5.2 # so that it is not executed by the cups-driverd (e.g. in response to a "lpinfo -m" request) # to avoid duplicated PPDs because we create the PPDs during compile-time (via --enable-cups-ppds) # and provide ready-made PPDs in /usr/share/cups/model/gutenprint/... in the RPM package # see "Regarding CUPS PPD files" at https://bugzilla.novell.com/show_bug.cgi?id=514994#c9 +%if 0%{?suse_version} == 1110 +# On SLE11 with its CUPS 1.3.9 there is still /usr/lib64/cups/ used on x86_64. +chmod a-x $RPM_BUILD_ROOT%_libdir/cups/driver/gutenprint.%{gutenprintmajor} +%else chmod a-x $RPM_BUILD_ROOT/usr/lib/cups/driver/gutenprint.%{gutenprintmajor} +%endif # Move the special testpattern generator away from the usual bin directory: mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintmajor} # Remove dispensable .po files (only the .mo files are needed on the end-users's system): @@ -180,11 +205,20 @@ %dir /usr/share/cups/model/gutenprint/%{gutenprintmajor} %dir /usr/share/cups/model/gutenprint/%{gutenprintmajor}/C /usr/share/cups/model/gutenprint/%{gutenprintmajor}/C/* +%if 0%{?suse_version} == 1110 +# On SLE11 with its CUPS 1.3.9 there is still /usr/lib64/cups/ used on x86_64. +%dir %_libdir/cups/driver +%_libdir/cups/driver/gutenprint.%{gutenprintmajor} +%_libdir/cups/filter/commandtocanon +%_libdir/cups/filter/commandtoepson +%_libdir/cups/filter/rastertogutenprint.%{gutenprintmajor} +%else %dir /usr/lib/cups/driver /usr/lib/cups/driver/gutenprint.%{gutenprintmajor} /usr/lib/cups/filter/commandtocanon /usr/lib/cups/filter/commandtoepson /usr/lib/cups/filter/rastertogutenprint.%{gutenprintmajor} +%endif %if 0%{?suse_version} >= 1140 /usr/lib/cups/backend/gutenprint52+usb %dir /usr/share/cups/usb -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
