Hello community, here is the log from the commit of package cups-drivers for openSUSE:Factory checked in at Tue Apr 13 22:14:04 CEST 2010. -------- --- cups-drivers/cups-drivers.changes 2010-02-12 07:08:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-drivers/cups-drivers.changes 2010-04-13 11:39:48.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 9 15:06:53 CEST 2010 - jsmeix@suse.de + +- 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). +- Fixed the previous unconditioned change from "PreReq: sysvinit" + to "PreReq: sysvinit-tools" which lets the build fail + everywhere except for openSUSE:Factory to a conditioned + "PreReq: sysvinit-tools" only "if suse_version > 1120" + so that it builds again for the Printing project. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-drivers.spec ++++++ --- /var/tmp/diff_new_pack.nnrCy6/_old 2010-04-13 22:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.nnrCy6/_new 2010-04-13 22:13:13.000000000 +0200 @@ -19,19 +19,24 @@ Name: cups-drivers -BuildRequires: a2ps bison cairo-devel cups-devel cupsddk foomatic-filters +BuildRequires: a2ps bison cairo-devel cups-ddk cups-devel foomatic-filters BuildRequires: gcc-c++ ghostscript-ijs-devel ghostscript-library BuildRequires: ghostscript-x11 gimp-devel glib2-devel gtk2-devel BuildRequires: libpng-devel libtiff-devel libxml2-devel BuildRequires: libxslt openssl-devel pango-devel -License: GPLv2 ; GPLv2+ +License: GPLv2+ Group: Hardware/Printing Summary: Drivers for the Common UNIX Printing System Version: 1.3.9 -Release: 5 +Release: 6 Provides: cups_drv Requires: ghostscript-library >= 7.05, foomatic-filters -PreReq: sysvinit-tools, sh-utils, procps +PreReq: sh-utils, procps +%if 0%{?suse_version} > 1120 +PreReq: sysvinit-tools +%else +PreReq: sysvinit +%endif Obsoletes: cups_drv AutoReqProv: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -87,7 +92,7 @@ Group: Hardware/Printing Requires: ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster Version: %{gutenprintver} -Release: 2 +Release: 3 Obsoletes: cups-drivers-stp Provides: cups-drivers-stp PreReq: procps @@ -103,7 +108,7 @@ Summary: Development Environment for Gutenprint Group: Hardware/Printing Version: %{gutenprintver} -Release: 2 +Release: 3 Requires: ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint = %{gutenprintver} Requires: gtk2-devel, glibc-devel @@ -122,7 +127,7 @@ Summary: GIMP plug-in for gutenprint Group: Hardware/Printing Version: %{gutenprintver} -Release: 2 +Release: 3 %description -n gutenprint-gimpplugin This package contains the gutenprint GIMP plug-in. @@ -266,7 +271,7 @@ PREFIX=%{_prefix} \ DESTDIR=$mydir/foomatic-db-engine \ install -echo "BuildRoot = '"$RPM_BUILD_ROOT\' +echo "BuildRoot = '$RPM_BUILD_ROOT'" cd ../foomatic-db-engine mkdir -p $mydir/foomatic-db-engine/usr/share/foomatic/templates make \ @@ -378,12 +383,27 @@ make DESTDIR=$RPM_BUILD_ROOT \ FOOMATIC_KITLOAD=${RPM_BUILD_DIR}/%{name}/foomatic-db-engine/foomatic-kitload \ install - mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}/C \ +# 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): +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 + then mv -f $RPM_BUILD_ROOT/usr/$D/cups/filter/$F $RPM_BUILD_ROOT/usr/lib/cups/filter/$F + fi + done + F="gutenprint.%{gutenprintmajor}" + if test -e $RPM_BUILD_ROOT/usr/$D/cups/driver/$F + then mv -f $RPM_BUILD_ROOT/usr/$D/cups/driver/$F $RPM_BUILD_ROOT/usr/lib/cups/driver/$F + fi +done +# +mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}/C \ $RPM_BUILD_ROOT/%{_datadir}/cups/model - rm $RPM_BUILD_ROOT/usr/share/locale/*/gutenprint_*.po - rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor} - rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint - mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/C \ +rm $RPM_BUILD_ROOT/usr/share/locale/*/gutenprint_*.po +rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor} +rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint +mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/C \ $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint cd .. # @@ -456,7 +476,7 @@ ##### SPLIX # cd splix -make CUPSFILTER="$RPM_BUILD_ROOT"%{_libdir}/cups/filter \ +make CUPSFILTER="$RPM_BUILD_ROOT"/usr/lib/cups/filter \ CUPSPPD="$RPM_BUILD_ROOT"/usr/share/cups/model \ install \ DISABLE_JBIG=1 @@ -523,7 +543,7 @@ %dir /usr/share/cups/model/0-driverppds # enf of LSB 3.2 stuff /usr/share/cups/model/[A-Z]*/*.ppd* -%{_libdir}/cups/filter/rastertospl2 +/usr/lib/cups/filter/rastertospl2 %dir /usr/share/m2300w %dir /usr/share/m2300w/%{m2300wver} %dir /usr/share/m2300w/%{m2300wver}/psfiles @@ -536,9 +556,9 @@ %{_bindir}/cups-calibrate %{_bindir}/escputil %{_bindir}/ijsgutenprint.%{gutenprintmajor} -# %{_libdir}/cups/backend -%{_libdir}/cups/filter/c* -%{_libdir}/cups/filter/rastertogutenprint* +/usr/lib/cups/filter/commandtocanon +/usr/lib/cups/filter/commandtoepson +/usr/lib/cups/filter/rastertogutenprint.%{gutenprintmajor} %{_sbindir}/cups-genppd* %dir /usr/share/cups %dir /usr/share/cups/model @@ -552,8 +572,8 @@ %dir /usr/share/gutenprint /usr/share/gutenprint/* %doc /usr/share/man/man?/*.gz -%dir %{_libdir}/cups/driver -%{_libdir}/cups/driver/gutenprint* +%dir /usr/lib/cups/driver +/usr/lib/cups/driver/gutenprint.%{gutenprintmajor} %files -n gutenprint-devel %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org