From b03e67e386e0e171ee38367401a31129cc6447187768cdee17e7739fdb222b12 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 22 Sep 2011 12:09:36 +0000 Subject: [PATCH 1/5] Accepting request 83156 from home:jengelh:bl-c - Remove redundant tags/sections from specfile OBS-URL: https://build.opensuse.org/request/show/83156 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=219 --- cups.changes | 5 +++++ cups.spec | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cups.changes b/cups.changes index 1e50bb8..712c99f 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 18 00:09:02 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + ------------------------------------------------------------------- Mon Jul 25 12:08:35 CEST 2011 - meissner@suse.de diff --git a/cups.spec b/cups.spec index 8e67c83..17a3243 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: cups @@ -341,9 +340,6 @@ mv $RPM_BUILD_ROOT/usr/share/locale/{zh,zh_CN} # Run fdupes: %fdupes $RPM_BUILD_ROOT -%clean -#test -n "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT - %pre /usr/sbin/groupadd -g 71 -o -r ntadmin 2>/dev/null || : # exit successfully in any case: From b9e308554a534b0c4cae73a0f739f2784914b965a47e7a9ab2a12c0990e6b14a Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 27 Sep 2011 09:14:03 +0000 Subject: [PATCH 2/5] Accepting request 84563 from home:msmeissn:branches:Printing include a 32bit devel package for Wine 32bit on 64bit builds OBS-URL: https://build.opensuse.org/request/show/84563 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=220 --- baselibs.conf | 2 ++ cups.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index e1bfada..b432821 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ cups-libs +cups-devel + requires "cups-libs- = " diff --git a/cups.changes b/cups.changes index 712c99f..2e3525b 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 23 09:54:39 CEST 2011 - meissner@suse.de + +- cups-devel baselibs package for Wine 32bit on 64bit building. + ------------------------------------------------------------------- Sun Sep 18 00:09:02 UTC 2011 - jengelh@medozas.de From 101e4da85950292f152b9edbfc3be8d790c81b6ae4b4d78e7be997b2fe4c72fd Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 29 Sep 2011 09:35:35 +0000 Subject: [PATCH 3/5] - cups-1.4.4-set_default_RIPCache_128m.patch enlarges the CUPS upstream default RIPCache from 8m to 128m to avoid various kind of printout failures (STR #3535, and Novell/openSUSE Bugzilla bnc#628233). OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=221 --- cups-1.4.4-set_default_RIPCache_128m.patch | 45 ++++++++++++++++++++++ cups.changes | 18 +++++++-- cups.spec | 6 +++ 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 cups-1.4.4-set_default_RIPCache_128m.patch diff --git a/cups-1.4.4-set_default_RIPCache_128m.patch b/cups-1.4.4-set_default_RIPCache_128m.patch new file mode 100644 index 0000000..3e941ad --- /dev/null +++ b/cups-1.4.4-set_default_RIPCache_128m.patch @@ -0,0 +1,45 @@ +--- scheduler/conf.c.orig 2010-09-15 12:37:30.000000000 +0200 ++++ scheduler/conf.c 2010-04-23 20:56:34.000000000 +0200 +@@ -540,7 +540,7 @@ cupsdReadConfiguration(void) + + cupsdClearString(&DefaultPaperSize); + +- cupsdSetString(&RIPCache, "8m"); ++ cupsdSetString(&RIPCache, "128m"); + + cupsdSetString(&TempDir, NULL); + +--- scheduler/cupsfilter.c.orig 2010-03-31 00:07:33.000000000 +0200 ++++ scheduler/cupsfilter.c 2010-09-15 12:39:14.000000000 +0200 +@@ -1218,7 +1218,7 @@ read_cupsd_conf(const char *filename) /* + else + set_string(&FontPath, CUPS_FONTPATH); + +- set_string(&RIPCache, "8m"); ++ set_string(&RIPCache, "128m"); + + if ((temp = getenv("CUPS_SERVERBIN")) != NULL) + set_string(&ServerBin, temp); +--- doc/help/ref-cupsd-conf.html.in.orig 2010-04-23 20:56:34.000000000 +0200 ++++ doc/help/ref-cupsd-conf.html.in 2010-09-15 12:45:44.000000000 +0200 +@@ -2646,7 +2646,7 @@ appear inside a Examples + + 
+-RIPCache 8m
++RIPCache 128m
+ RIPCache 1g
+ RIPCache 2048k
+
+@@ -2657,8 +2657,9 @@ RIPCache 2048k + memory cache used by Raster Image Processor ("RIP") filters such + as imagetoraster and pstoraster. The + size can be suffixed with a "k" for kilobytes, "m" for megabytes, +-or "g" for gigabytes. The default cache size is "8m", or 8 +-megabytes.

++or "g" for gigabytes. The default cache size is "128m", or 128 ++megabytes (compare ++CUPS STR 3535).

+ + +

CUPS 1.1.16RootCertDuration

diff --git a/cups.changes b/cups.changes index 2e3525b..42258ce 100644 --- a/cups.changes +++ b/cups.changes @@ -1,18 +1,30 @@ +------------------------------------------------------------------- +Thu Sep 29 11:20:00 CEST 2011 - jsmeix@suse.de + +- cups-1.4.4-set_default_RIPCache_128m.patch enlarges + the CUPS upstream default RIPCache from 8m to 128m + to avoid various kind of printout failures + (STR #3535, and Novell/openSUSE Bugzilla bnc#628233). + ------------------------------------------------------------------- Fri Sep 23 09:54:39 CEST 2011 - meissner@suse.de -- cups-devel baselibs package for Wine 32bit on 64bit building. +- cups-devel baselibs package for Wine 32bit on 64bit building + (added "cups-devel requires cups-libs..." to baselibs.conf). ------------------------------------------------------------------- Sun Sep 18 00:09:02 UTC 2011 - jengelh@medozas.de - Remove redundant tags/sections from specfile + (removed "norootforbuild" and the "clean" section). ------------------------------------------------------------------- Mon Jul 25 12:08:35 CEST 2011 - meissner@suse.de - "no" locale is "nb" (norwegian bokmal) these days -- "zh" is probably meant as "zh_CN", as "zh_TW" exists. + (move /usr/share/locale/no to /usr/share/locale/nb). +- "zh" is probably meant as "zh_CN", as "zh_TW" exists + (move /usr/share/locale/zh to /usr/share/locale/zh_CN). ------------------------------------------------------------------- Thu Feb 10 11:51:56 CET 2011 - jsmeix@suse.de @@ -38,7 +50,7 @@ Fri Jan 14 14:25:39 CET 2011 - jsmeix@suse.de ------------------------------------------------------------------- Thu Dec 9 13:26:06 CET 2010 - jsmeix@suse.de -- Fixing coolo's quick and ditry unconditioned +- Fixed coolo's quick and ditry unconditioned "PreReq: sysvinit(syslog)" stuff from below because build fails everywhere except openSUSE:Factory (i.e. openSUSE 11.4) because sysvinit(syslog) is nowhere else provided. diff --git a/cups.spec b/cups.spec index 17a3243..57fb830 100644 --- a/cups.spec +++ b/cups.spec @@ -108,6 +108,10 @@ Patch104: cups-1.4-additional_policies.patch # Patch105 reverts changes by CUPS STR #3461 as band-aid workaround # to avoid https://bugzilla.novell.com/show_bug.cgi?id=617026 for now: Patch105: cups-1.4.4-str3461-1.4.reverted.patch +# Patch106 enlarges the CUPS upstream default RIPCache from 8m to 128m +# to avoid various kind of printout failures +# see https://bugzilla.novell.com/show_bug.cgi?id=628233 +Patch106: cups-1.4.4-set_default_RIPCache_128m.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -229,6 +233,8 @@ http://www.cups.org # Patch105 reverts changes by CUPS STR #3461 as band-aid workaround # to avoid https://bugzilla.novell.com/show_bug.cgi?id=617026 for now: %patch105 -p1 +# Patch106 enlarges the CUPS upstream default RIPCache from 8m to 128m: +%patch106 %build # Disable SILENT run of make so that make runs verbose as usual: From 6fe1542ffbd5b4cb307294184fba6c179f978b8ef22c0096beb6df8794dde4a8 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 29 Sep 2011 10:46:25 +0000 Subject: [PATCH 4/5] - Upgraded to CUPS 1.4.8 * network backends could crash if a printer returned a value of 0 for the maximum capacity for a supply (STR #3875) * For a complete list see the CHANGES.txt file. - Upgraded to CUPS 1.4.7 * imageto* filters could crash with bad GIF files (STR #3867) * CUPS did not work with some printers that incorrectly implemented the HTTP/1.1 standard (STR #3778, STR #3791) * Fixed crash in scheduler when the application/octet-stream MIME type was not defined (STR #3690) * The web interface no longer tries to use multi-part delivery when adding printers (STR #3455) using Epiphany or IE * "lp" and "lpr" failed with Kerberos enabled (STR #3768) * Remote printer URIs with options did not work (STR #3717) * The scheduler now only looks up interface hostnames if HostNameLookups are enabled (STR #3737) * The scheduler could crash if a browsed printer times out while a job is printing (STR #3754) * For a complete list see the CHANGES.txt file. OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=222 --- cups-1.4.6-source.tar.bz2 | 3 --- cups-1.4.8-source.tar.bz2 | 3 +++ cups.changes | 23 +++++++++++++++++++++++ cups.spec | 6 +++--- 4 files changed, 29 insertions(+), 6 deletions(-) delete mode 100644 cups-1.4.6-source.tar.bz2 create mode 100644 cups-1.4.8-source.tar.bz2 diff --git a/cups-1.4.6-source.tar.bz2 b/cups-1.4.6-source.tar.bz2 deleted file mode 100644 index 40f11f8..0000000 --- a/cups-1.4.6-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514 -size 4517061 diff --git a/cups-1.4.8-source.tar.bz2 b/cups-1.4.8-source.tar.bz2 new file mode 100644 index 0000000..9e799f8 --- /dev/null +++ b/cups-1.4.8-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6 +size 4547162 diff --git a/cups.changes b/cups.changes index 42258ce..91bfa71 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Sep 29 11:51:21 CEST 2011 - jsmeix@suse.de + +- Upgraded to CUPS 1.4.8 + * network backends could crash if a printer returned a value + of 0 for the maximum capacity for a supply (STR #3875) + * For a complete list see the CHANGES.txt file. +- Upgraded to CUPS 1.4.7 + * imageto* filters could crash with bad GIF files (STR #3867) + * CUPS did not work with some printers that incorrectly + implemented the HTTP/1.1 standard (STR #3778, STR #3791) + * Fixed crash in scheduler when the application/octet-stream + MIME type was not defined (STR #3690) + * The web interface no longer tries to use multi-part delivery + when adding printers (STR #3455) using Epiphany or IE + * "lp" and "lpr" failed with Kerberos enabled (STR #3768) + * Remote printer URIs with options did not work (STR #3717) + * The scheduler now only looks up interface hostnames + if HostNameLookups are enabled (STR #3737) + * The scheduler could crash if a browsed printer times out + while a job is printing (STR #3754) + * For a complete list see the CHANGES.txt file. + ------------------------------------------------------------------- Thu Sep 29 11:20:00 CEST 2011 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index 57fb830..b12c734 100644 --- a/cups.spec +++ b/cups.spec @@ -34,9 +34,9 @@ License: GPLv2+ ; LGPLv2.1+ Group: Hardware/Printing Summary: The Common UNIX Printing System # Source0...Source9 is for sources from upstream: -# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.6/cups-1.4.6-source.tar.bz2 -# MD5 sum for Source0 on http://www.cups.org/software.php de8fb5a29c36554925c0c6a6e2c0dae1 -Version: 1.4.6 +# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.8/cups-1.4.8-source.tar.bz2 +# MD5 sum for Source0 on http://www.cups.org/software.php 0ec52d3f3c69bc2ab5ed70c594edbce6 +Version: 1.4.8 Release: 2 Source0: cups-%{version}-source.tar.bz2 # Require the exact matching version-release of the cups-libs sub-package because From 3b47653c7cd27b13b9066f2a71ad30237846fd4cc015c6ed88cb28204e37e37f Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 29 Sep 2011 13:17:11 +0000 Subject: [PATCH 5/5] - Reverted the change from meissner below dated "Fri Sep 23 09:54:39 CEST 2011" so that baselibs.conf again contains only one line "cups-libs" as before because the submitrequest 85423 Printing/cups -> openSUSE:Factory/cups was declined by coolo with the following reason: "cups-devel-32bit requires cups-32bit (default requires), which does not exist". OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=223 --- baselibs.conf | 2 -- cups.changes | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index b432821..e1bfada 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1 @@ cups-libs -cups-devel - requires "cups-libs- = " diff --git a/cups.changes b/cups.changes index 91bfa71..8267196 100644 --- a/cups.changes +++ b/cups.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 29 15:10:07 CEST 2011 - jsmeix@suse.de + +- Reverted the change from meissner below dated + "Fri Sep 23 09:54:39 CEST 2011" so that baselibs.conf again + contains only one line "cups-libs" as before because the + submitrequest 85423 Printing/cups -> openSUSE:Factory/cups + was declined by coolo with the following reason: + "cups-devel-32bit requires cups-32bit (default requires), + which does not exist". + ------------------------------------------------------------------- Thu Sep 29 11:51:21 CEST 2011 - jsmeix@suse.de