Accepting request 85447 from Printing
Upgrade to CUPS 1.4.8 and have the fix for bnc#628233 in 11.4 also in Factory (bnc#718707) and reverted the change for baselibs.conf so that it is again as before (bnc#721194) OBS-URL: https://build.opensuse.org/request/show/85447 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=92
This commit is contained in:
Lars Vogdt
Git OBS Bridge
commit
09c90835e3
45
cups-1.4.4-set_default_RIPCache_128m.patch
Normal file
45
cups-1.4.4-set_default_RIPCache_128m.patch
Normal file
@ -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 <A HREF="#Location"><COD
|
||||
<H3>Examples</H3>
|
||||
|
||||
<PRE CLASS="command">
|
||||
-RIPCache 8m
|
||||
+RIPCache 128m
|
||||
RIPCache 1g
|
||||
RIPCache 2048k
|
||||
</PRE>
|
||||
@@ -2657,8 +2657,9 @@ RIPCache 2048k
|
||||
memory cache used by Raster Image Processor ("RIP") filters such
|
||||
as <CODE>imagetoraster</CODE> and <CODE>pstoraster</CODE>. 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.</P>
|
||||
+or "g" for gigabytes. The default cache size is "128m", or 128
|
||||
+megabytes (compare <A HREF="http://www.cups.org/str.php?L3535">
|
||||
+<CODE>CUPS STR 3535</CODE></A>).</P>
|
||||
|
||||
|
||||
<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.16</SPAN><A NAME="RootCertDuration">RootCertDuration</A></H2>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
|
||||
size 4517061
|
||||
3
cups-1.4.8-source.tar.bz2
Normal file
3
cups-1.4.8-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
|
||||
size 4547162
|
||||
60
cups.changes
60
cups.changes
@ -1,8 +1,64 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
- 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
|
||||
(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
|
||||
@ -28,7 +84,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.
|
||||
|
||||
16
cups.spec
16
cups.spec
@ -15,7 +15,6 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: cups
|
||||
@ -35,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
|
||||
@ -109,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
|
||||
|
||||
@ -230,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:
|
||||
@ -341,9 +346,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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user