commit cups-drivers for openSUSE:Factory

29 Jan 2010

Hello community,

here is the log from the commit of package cups-drivers for openSUSE:Factory
checked in at Fri Jan 29 18:38:53 CET 2010.



--------

--- cups-drivers/cups-drivers.changes	2009-07-14 10:21:54.000000000 +0200
+++ cups-drivers/cups-drivers.changes	2010-01-18 10:22:02.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Sep 17 01:05:30 CEST 2009 - crrodriguez@suse.de
+
+- use find_lang macro 
+
+-------------------------------------------------------------------
+Tue Sep  1 16:56:51 CEST 2009 - kernel01@hailfinger.org
+
+- update gutenprint to 5.2.4
+  - The "epson" and "canon" backends have been removed as they
+    are not strictly needed with CUPS 1.2
+  - see NEWS for the details and list of changes
+
+-------------------------------------------------------------------
@@ -5,0 +19,5 @@
+
+-------------------------------------------------------------------
+Fri Jan 23 00:00:00 CET 2009 - kernel01@hailfinger.org
+
+- update gutenprint to 5.2.3

calling whatdependson for head-i586


Old:
----
  gutenprint-5.0.0-A4.patch
  gutenprint-5.0.2-resolution.patch
  gutenprint-5.0.2-updp10_pagesize.patch
  gutenprint-5.0.2.tar.bz2

New:
----
  gutenprint-5.2.3-A4.patch
  gutenprint-5.2.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cups-drivers.spec ++++++
--- /var/tmp/diff_new_pack.qGIwiL/_old	2010-01-29 18:14:52.000000000 +0100
+++ /var/tmp/diff_new_pack.qGIwiL/_new	2010-01-29 18:14:52.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package cups-drivers (Version 1.3.9)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products 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,13 +22,13 @@
 BuildRequires:  a2ps bison cairo-devel cups-devel cupsddk foomatic-filters
 BuildRequires:  gcc-c++ ghostscript-ijs-devel ghostscript-library
 BuildRequires:  ghostscript-x11 gimp-devel glib2-devel gtk2-devel
-BuildRequires:  libgimpprint-devel libpng-devel libtiff-devel libxml2-devel
+BuildRequires:  libpng-devel libtiff-devel libxml2-devel
 BuildRequires:  libxslt openssl-devel pango-devel
-License:        GPL v2 only ; GPL v2 or later
+License:        GPLv2 ; GPLv2+
 Group:          Hardware/Printing
 Summary:        Drivers for the Common UNIX Printing System
 Version:        1.3.9
-Release:        3
+Release:        4
 Provides:       cups_drv
 Requires:       ghostscript-library >= 7.05, foomatic-filters
 PreReq:         sysvinit, sh-utils, procps
@@ -40,7 +40,8 @@
 # linuxprinting.org database variables
 %define DBDate 20080909
 %define foomaticver bzr
-%define gutenprintver 5.0.2
+%define gutenprintver 5.2.4
+%define gutenprintmajor 5.2
 %define splixver 1.1.1
 %define m2300wver 0.51
 #URL: http://www.linuxprinting.org/download/foomatic/
@@ -61,9 +62,7 @@
 Patch5:         cups-drivers-1.3.8-Samsung-CLP-550.patch
 Patch6:         cups-drivers-1.3.8-gcc_warn.patch
 Patch7:         cups-drivers-1.3.9-maxspot_compare.patch
-Patch300:       gutenprint-5.0.0-A4.patch
-Patch301:       gutenprint-5.0.2-resolution.patch
-Patch302:       gutenprint-5.0.2-updp10_pagesize.patch
+Patch300:       gutenprint-5.2.3-A4.patch
 Patch400:       splix-1.1.1-install.patch
 Patch401:       splix-1.1.1-make.patch
 Patch500:       m2300w-0.51-foomatic.patch
@@ -83,12 +82,12 @@
     Grant Taylor <www.linuxprinting.com>
 
 %package -n gutenprint
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Gutenprint drivers for CUPS
 Group:          Hardware/Printing
 Requires:       ghostscript-library >= 7.05, cups >= 1.2.2, pstoraster
 Version:        %{gutenprintver}
-Release:        16
+Release:        1
 Obsoletes:      cups-drivers-stp
 Provides:       cups-drivers-stp
 PreReq:         procps
@@ -100,11 +99,11 @@
 
 
 %package -n gutenprint-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Development Environment for Gutenprint
 Group:          Hardware/Printing
 Version:        %{gutenprintver}
-Release:        16
+Release:        1
 Requires:       ghostscript-library >= 7.05, cups >= 1.2.2, gutenprint = %{gutenprintver}
 Requires:       gtk2-devel, glibc-devel
 
@@ -119,11 +118,11 @@
     Grant Taylor <www.linuxprinting.com>
 
 %package -n gutenprint-gimpplugin
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        GIMP plug-in for gutenprint
 Group:          Hardware/Printing
 Version:        %{gutenprintver}
-Release:        6
+Release:        1
 
 %description -n gutenprint-gimpplugin
 This package contains the gutenprint GIMP plug-in.
@@ -164,8 +163,6 @@
 #
 pushd gutenprint
 %patch300 -p1
-%patch301 -p1
-%patch302 -p1
 popd
 #
 #
@@ -245,8 +242,8 @@
 # unusable printer/driver combos.
 perl ./foomatic-cleanupdrivers ../foomatic-db
 #
-# Add the Foomatgic data for gutenprint
-perl ./foomatic-kitload -k ../gutenprint/src/foomatic/foomatic-db/gutenprint-ijs.5.0 -f
+# Add the Foomatic data for gutenprint
+perl ./foomatic-kitload -k ../gutenprint/src/foomatic/foomatic-db/gutenprint-ijs.%{gutenprintmajor} -f
 #
 # Correct the default drivers of the printer entries to have a valid
 # default for every printer.
@@ -269,7 +266,7 @@
 	PREFIX=%{_prefix} \
 	DESTDIR=$mydir/foomatic-db-engine \
 	install
-echo "BuilRoot = '"$RPM_BUILD_ROOT\'
+echo "BuildRoot = '"$RPM_BUILD_ROOT\'
 cd ../foomatic-db-engine
 mkdir -p $mydir/foomatic-db-engine/usr/share/foomatic/templates
 make \
@@ -381,15 +378,16 @@
 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/5.0/C \
+	mv $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/%{gutenprintmajor}/C \
 	   $RPM_BUILD_ROOT/%{_datadir}/cups/model
-	rmdir $RPM_BUILD_ROOT/%{_datadir}/cups/model/gutenprint/5.0
+	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 ..
 #
-mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintver}
+mv $RPM_BUILD_ROOT/%{_bindir}/testpattern $RPM_BUILD_ROOT/%{_libdir}/gutenprint/%{gutenprintmajor}
 #
 ##### GUTENPRINT (end)
 #
@@ -482,6 +480,7 @@
 # set LSB symlink to let CUPS find the PPDs
 ln -s /usr/share/ppd $RPM_BUILD_ROOT/usr/share/cups/model/0-driverppds
 #
+%find_lang gutenprint
 
 %clean
 test -n "$RPM_BUILD_ROOT" &&
@@ -531,13 +530,13 @@
 /usr/share/m2300w/%{m2300wver}/psfiles/*
 %doc %{_defaultdocdir}/%{name}
 
-%files -n gutenprint
+%files -n gutenprint -f gutenprint.lang
 %defattr(-,root,root)
 %config /etc/cups/command.types
 %{_bindir}/cups-calibrate
 %{_bindir}/escputil
-%{_bindir}/ijsgutenprint.5.0
-%{_libdir}/cups/backend
+%{_bindir}/ijsgutenprint.%{gutenprintmajor}
+# %{_libdir}/cups/backend
 %{_libdir}/cups/filter/c*
 %{_libdir}/cups/filter/rastertogutenprint*
 %{_sbindir}/cups-genppd*
@@ -547,12 +546,11 @@
 %dir /usr/share/cups/model/gutenprint
 /usr/share/cups/model/gutenprint/*
 %dir %{_libdir}/gutenprint
-%dir %{_libdir}/gutenprint/%{gutenprintver}
-%{_libdir}/gutenprint/%{gutenprintver}/*
+%dir %{_libdir}/gutenprint/%{gutenprintmajor}
+%{_libdir}/gutenprint/%{gutenprintmajor}/*
 %{_libdir}/libgutenprint*.so?*
 %dir /usr/share/gutenprint
 /usr/share/gutenprint/*
-/usr/share/locale/*/*/gutenprint*
 %doc /usr/share/man/man?/*.gz
 %dir %{_libdir}/cups/driver
 %{_libdir}/cups/driver/gutenprint*

++++++ gutenprint-5.0.0-A4.patch -> gutenprint-5.2.3-A4.patch ++++++
--- cups-drivers/gutenprint-5.0.0-A4.patch	2007-01-16 00:08:18.000000000 +0100
+++ cups-drivers/gutenprint-5.2.3-A4.patch	2009-01-23 11:27:54.000000000 +0100
@@ -1,62 +1,41 @@
-Index: src/main/papers.xml
-===================================================================
-RCS file: /cvsroot/gimp-print/print/src/main/papers.xml,v
-retrieving revision 1.21
-diff -u -r1.21 papers.xml
---- gutenprint-5.0.0/src/main/papers.xml	20 Apr 2006 00:33:41 -0000	1.21
-+++ gutenprint-5.0.0/src/main/papers.xml	7 Sep 2006 13:20:20 -0000
-@@ -19,6 +19,16 @@
-   xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+--- gutenprint-5.2.3/src/xml/papers.xml~	2009-01-22 16:19:12.000000000 +0100
++++ gutenprint-5.2.3/src/xml/papers.xml	2009-01-22 16:19:20.000000000 +0100
+@@ -46,6 +46,20 @@
+ </copyright>
    <paperdef>
  <!-- GROUP: Imperial -->
 +<!-- 
 +   put "A4" at the beginning to get it as default size (if possible) 
 +-->
 +    <paper name="A4">
-+      <description value="A4"/>
++      <description translate="value" value="A4"/>
 +      <comment value="210mm x 297mm"/>
 +      <width value="595"/>
 +      <height value="842"/>
 +      <unit value="metric"/>
++<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
++<!-- problems with page margins that were present in 5.0.0.  That -->
++<!-- workaround is no longer needed.  Please see the explanation at the -->
++<!-- top of this file. -->
 +    </paper>
      <paper name="Letter">
-       <description value="Letter"/>
+       <description translate="value" value="Letter"/>
        <comment value="8.5in x 11in"/>
-@@ -268,13 +278,6 @@
+@@ -316,17 +330,6 @@
        <height value="1191"/>
        <unit value="metric"/>
      </paper>
 -    <paper name="A4">
--      <description value="A4"/>
+-      <description translate="value" value="A4"/>
 -      <comment value="210mm x 297mm"/>
 -      <width value="595"/>
 -      <height value="842"/>
 -      <unit value="metric"/>
+-<!-- DISTRIBUTORS: Please do NOT insert margins here to work around -->
+-<!-- problems with page margins that were present in 5.0.0.  That -->
+-<!-- workaround is no longer needed.  Please see the explanation at the -->
+-<!-- top of this file. -->
 -    </paper>
      <paper name="A5">
-       <description value="A5"/>
+       <description translate="value" value="A5"/>
        <comment value="148mm x 210mm"/>
---- gutenprint/src/main/papers.xml.orig	2006-11-27 17:27:23.000000000 +0100
-+++ gutenprint/src/main/papers.xml	2006-11-27 17:28:54.000000000 +0100
-@@ -27,6 +27,10 @@
-       <comment value="210mm x 297mm"/>
-       <width value="595"/>
-       <height value="842"/>
-+      <top value="24"/>
-+      <left value="24"/>
-+      <bottom value="48"/>
-+      <right value="24"/>
-       <unit value="metric"/>
-     </paper>
-     <paper name="Letter">
-@@ -34,6 +38,10 @@
-       <comment value="8.5in x 11in"/>
-       <width value="612"/>
-       <height value="792"/>
-+      <top value="24"/>
-+      <left value="24"/>
-+      <bottom value="48"/>
-+      <right value="24"/>
-       <unit value="english"/>
-     </paper>
-     <paper name="Legal">

++++++ gutenprint-5.0.2.tar.bz2 -> gutenprint-5.2.4.tar.bz2 ++++++
++++ 654424 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)