Hello community, here is the log from the commit of package cups-drivers checked in at Thu Apr 12 17:11:45 CEST 2007. -------- --- cups-drivers/cups-drivers.changes 2006-12-13 15:24:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-drivers/cups-drivers.changes 2007-04-11 18:02:58.193997000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 11 18:02:16 CEST 2007 - kssingvo@suse.de + +- updated gutenprint to 5.0.99.1 +- added m2300w driver for Minolta Colorlaser with Windows interface +- fixed uninitialized variable issue in gutenprint (bugzilla#230172) +- added security patch for gutenprint + +------------------------------------------------------------------- Old: ---- gutenprint-5.0.0.tar.bz2 New: ---- gutenprint-5.0.0.99.1-printf.patch gutenprint-5.0.0.99.1.tar.bz2 m2300w-0.51-foomatic.patch m2300w-0.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-drivers.spec ++++++ --- /var/tmp/diff_new_pack.eb6776/_old 2007-04-12 17:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.eb6776/_new 2007-04-12 17:09:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cups-drivers (Version 1.2.7) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,12 +11,14 @@ # norootforbuild Name: cups-drivers -BuildRequires: a2ps cups-devel gcc-c++ ghostscript-library gtk2-devel libgimpprint-devel libpng-devel libtiff-devel libxml2-devel libxslt openssl-devel +BuildRequires: a2ps cups-devel foomatic-filters gcc-c++ ghostscript-library +BuildRequires: gtk2-devel libgimpprint-devel libpng-devel libtiff-devel +BuildRequires: bison libxml2-devel libxslt openssl-devel License: GNU General Public License (GPL) Group: Hardware/Printing Summary: Drivers for the Common UNIX Printing System Version: 1.2.7 -Release: 10 +Release: 31 Provides: cups_drv Requires: ghostscript-library >= 7.05, foomatic-filters PreReq: sysvinit, sh-utils @@ -28,8 +30,9 @@ # linuxprinting.org database variables %define DBDate 20061018 %define foomaticver cvs -%define gutenprintver 5.0.0 +%define gutenprintver 5.0.0.99.1 %define splixver 1.0.1-beta2 +%define m2300wver 0.51 #URL: http://www.linuxprinting.org/download/foomatic/ Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{foomaticver}-%{DBDate}.tar.bz2 Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{foomaticver}-%{DBDate}.tar.bz2 @@ -37,6 +40,7 @@ # make sure that gimp-print version NEVER differs from ghostscript-library Source3: gutenprint-%{gutenprintver}.tar.bz2 Source4: splix-1.0.1-beta2.tar.bz2 +Source5: http://heanet.dl.sourceforge.net/sourceforge/m2300w/m2300w-%{m2300wver}.tar.bz2 Source100: foomatic-driver.known Source101: foomatic-driver.unsupported Patch0: cups-drivers-1.2.2-A4.patch @@ -44,7 +48,9 @@ Patch2: cups-drivers-1.1.23-stcolor.patch Patch300: gutenprint-5.0.0-A4.patch Patch301: gutenprint-5.0.0-sysfs.patch +Patch302: gutenprint-5.0.0.99.1-printf.patch Patch400: splix-1.0.1_beta2-install.patch +Patch500: m2300w-0.51-foomatic.patch %description This package contains free printer driver descriptions for CUPS. It @@ -106,6 +112,8 @@ mv gutenprint-%{gutenprintver} gutenprint %setup -q -T -D -a 4 -n %{name} mv splix-%{splixver} splix +%setup -q -T -D -a 5 -n %{name} +mv m2300w-%{m2300wver} m2300w %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -113,6 +121,7 @@ pushd gutenprint %patch300 -p1 %patch301 -p1 +%patch302 -p1 popd # # @@ -120,6 +129,11 @@ %patch400 -p1 popd # +# +pushd m2300w +%patch500 -p1 +popd +# # ------- %Build --------------------------------------------------------- %build @@ -127,32 +141,6 @@ mydir=$RPM_BUILD_DIR/%{name} # Generate a working set into the package source tree # -##### GUTENPRINT -# start with gutenprint and generate foomatic files. -export PATH=$PATH":$mydir" -pushd gutenprint -CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" ./configure \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ - --disable-static \ - --enable-shared \ - --enable-cups-ppds \ - --enable-translated-cups-ppds=no \ - --enable-simplified-cups-ppds=yes \ - --disable-libgutenprintui \ - --enable-libgutenprintui2 \ - --enable-samples \ - --enable-escputil \ - --with-pic=yes \ - --with-foomatic \ - --with-foomatic3 \ - --without-gimp \ - --without-gimp2 -make -popd ##### FOOMATIC cd foomatic-db ./make_configure @@ -277,12 +265,46 @@ done cd .. # +##### GUTENPRINT +# start with gutenprint and generate foomatic files. +export PATH=$PATH":$mydir" +pushd gutenprint +CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" ./configure \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --sysconfdir=%{_sysconfdir} \ + --libdir=%{_libdir} \ + --disable-static \ + --enable-shared \ + --enable-cups-ppds \ + --enable-translated-cups-ppds=no \ + --enable-simplified-cups-ppds=yes \ + --disable-libgutenprintui \ + --enable-libgutenprintui2 \ + --enable-samples \ + --enable-escputil \ + --with-pic=yes \ + --with-foomatic \ + --with-foomatic3 \ + --without-gimp \ + --without-gimp2 +make +popd +# ##### SPLIX # cd splix make CXXFLAGS="$RPM_OPT_FLAGS -I../include "`cups-config --cflags` cd .. # +##### Minolta 2300W +# +cd m2300w +./configure --prefix=%{_prefix} +make CFLAGS="$RPM_OPT_FLAGS" +cd .. +# # ------- %Install ------------------------------------------------------- %install @@ -388,6 +410,17 @@ make CUPSFILTER="$RPM_BUILD_ROOT"%{_libdir}/cups/filter \ CUPSPPD="$RPM_BUILD_ROOT"/usr/share/cups/model install cd .. +# +##### Minolta 2300W +# +cd m2300w +make install \ + INSTROOT=$RPM_BUILD_ROOT \ + DOCDIR=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/m2300w-%{m2300wver} +rm -rf $RPM_BUILD_ROOT/usr/share/YaST2 +gzip -9 $RPM_BUILD_ROOT/usr/share/cups/model/Minolta/*-m2?00w.ppd +cd .. +# %clean test -n "$RPM_BUILD_ROOT" && @@ -417,11 +450,19 @@ %files %defattr(-,root,root) +%{_bindir}/m2300w +%{_bindir}/m2400w +%{_bindir}/m2300w-wrapper %dir /usr/share/cups %dir /usr/share/cups/model %dir /usr/share/cups/model/[A-Z]* /usr/share/cups/model/[A-Z]*/*.ppd* %{_libdir}/cups/filter/rastertospl2 +%dir /usr/share/m2300w +%dir /usr/share/m2300w/%{m2300wver} +%dir /usr/share/m2300w/%{m2300wver}/psfiles +/usr/share/m2300w/%{m2300wver}/psfiles/* +%doc %{_defaultdocdir}/%{name} %files -n gutenprint %defattr(-,root,root) @@ -446,6 +487,8 @@ /usr/share/gutenprint/* /usr/share/locale/*/*/gutenprint* %doc /usr/share/man/man?/*.gz +%dir %{_libdir}/cups/driver +%{_libdir}/cups/driver/gutenprint* %files -n gutenprint-devel %defattr(-,root,root) @@ -456,7 +499,12 @@ %{_libdir}/libgutenprint*.la %{_libdir}/pkgconfig/gutenprint* -%changelog -n cups-drivers +%changelog +* Wed Apr 11 2007 - kssingvo@suse.de +- updated gutenprint to 5.0.99.1 +- added m2300w driver for Minolta Colorlaser with Windows interface +- fixed uninitialized variable issue in gutenprint (bugzilla#230172) +- added security patch for gutenprint * Wed Dec 13 2006 - kssingvo@suse.de - fixed issue with duplicate packaged filter rastertospl2 * Mon Dec 11 2006 - kssingvo@suse.de ++++++ gutenprint-5.0.0.99.1-printf.patch ++++++ --- gutenprint/src/testpattern/testpatterny.y.orig 2005-01-26 04:08:00.000000000 +0100 +++ gutenprint/src/testpattern/testpatterny.y 2007-04-11 15:37:36.000000000 +0200 @@ -532,7 +532,7 @@ Message0: MESSAGE tSTRING { - fprintf(stderr, $2); + fprintf(stderr, "%s\n", $2); free($2); } ; --- gutenprint/src/gutenprintui2/plist.c.orig 2007-03-02 13:01:19.000000000 +0100 +++ gutenprint/src/gutenprintui2/plist.c 2007-04-11 15:42:58.000000000 +0200 @@ -321,7 +321,7 @@ static void stpui_errfunc(void *file, const char *buf, size_t bytes) { - g_message(buf); + g_message("%s", buf); } void ++++++ gutenprint-5.0.0.tar.bz2 -> gutenprint-5.0.0.99.1.tar.bz2 ++++++ ++++ 267318 lines of diff (skipped) ++++++ m2300w-0.51-foomatic.patch ++++++ --- m2300w/foomatic/Makefile.in.orig 2005-10-05 21:38:00.000000000 +0200 +++ m2300w/foomatic/Makefile.in 2007-03-28 14:41:08.000000000 +0200 @@ -20,12 +20,14 @@ install: rm -rf $(SRC)/opt/m2300w-*.xml - for DIR in opt driver printer ; do \ - $(INSTALL) -d -m 755 $(SRC)/$$DIR ; \ - for F in $$DIR/*.xml ; do \ - $(INSTALL) -m 644 $$F $(SRC)/$$DIR ; \ - done ; \ - done + if [ -d $(SRC) ]; then + for DIR in opt driver printer ; do \ + $(INSTALL) -d -m 755 $(SRC)/$$DIR ; \ + for F in $$DIR/*.xml ; do \ + $(INSTALL) -m 644 $$F $(SRC)/$$DIR ; \ + done ; \ + done + fi $(INSTALL) -d -m 755 $(SHARE)/foomatic $(INSTALL) -m 755 foomatic-rip $(SHARE)/foomatic ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org