Hello community,
here is the log from the commit of package cups for openSUSE:Factory
checked in at Fri Dec 4 10:21:56 CET 2009.
--------
--- cups/cups.changes 2009-11-11 11:56:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/cups/cups.changes 2009-11-12 02:25:01.000000000 +0100
@@ -16,0 +17,5 @@
+Tue Nov 3 19:09:12 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:28.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:28.000000000 +0100
@@ -26,11 +26,11 @@
PreReq: textutils, fileutils, sh-utils, %insserv_prereq,
PreReq: %fillup_prereq /usr/sbin/groupadd
Url: http://www.cups.org/
-License: GPL v2 or later
+License: GPLv2+
Group: Hardware/Printing
Summary: The Common UNIX Printing System
Version: 1.3.11
-Release: 4
+Release: 5
Requires: cups-libs = %{version}, cups-client = %{version}
Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters
Requires: util-linux /usr/bin/pdftops
@@ -144,7 +144,7 @@
%define CPUs %(grep -c ^processor\ /proc/cpuinfo || echo 1)
%package libs
-License: GPL v2 or later ; LGPL v2.1 or later
+License: GPLv2+ ; LGPLv2.1+
Summary: Libraries for CUPS
Group: Hardware/Printing
# bug437293
@@ -166,7 +166,7 @@
Easy Software Products
%package client
-License: GPL v2 or later
+License: GPLv2+
Summary: CUPS Client Programs
Group: Hardware/Printing
Conflicts: plp lprold lprng
@@ -185,7 +185,7 @@
Easy Software Products
%package devel
-License: GPL v2 or later
+License: GPLv2+
Summary: Development Environment for CUPS
Group: Development/Libraries/C and C++
Requires: %{name}-libs = %{version} openssl-devel glibc-devel krb5-devel
++++++ cups-1.1.21-testppd_duplex.patch ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:28.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:28.000000000 +0100
@@ -1,14 +1,16 @@
---- cups-1.1.21/systemv/cupstestppd.c.orig 2004-08-23 20:36:50.000000000 +0200
-+++ cups-1.1.21/systemv/cupstestppd.c 2004-09-20 16:19:12.427769515 +0200
-@@ -854,6 +854,7 @@
- strcmp(choice->choice, "DuplexTumble") &&
- strcmp(choice->choice, "SimplexTumble"))
+Index: cups-1.3.11/systemv/cupstestppd.c
+===================================================================
+--- cups-1.3.11.orig/systemv/cupstestppd.c
++++ cups-1.3.11/systemv/cupstestppd.c
+@@ -931,6 +931,7 @@ main(int argc, /* I - Number of comm
+ if (size->left == 0.0 && size->bottom == 0.0 &&
+ size->right == 0.0 && size->top == 0.0)
{
+#if 0
if (verbose >= 0)
{
if (!errors && !verbose)
-@@ -865,6 +866,10 @@
+@@ -945,6 +946,10 @@ main(int argc, /* I - Number of comm
}
errors ++;
@@ -17,5 +19,5 @@
+ option->keyword, choice->choice);
+#endif
}
- }
+ /*
++++++ cups-1.2.0-ppdsdat_generation.patch ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:28.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:28.000000000 +0100
@@ -1,15 +1,17 @@
---- cups-1.2.0/scheduler/main.c.orig 2006-03-18 04:05:12.000000000 +0100
-+++ cups-1.2.0/scheduler/main.c 2006-03-29 19:02:22.000000000 +0200
-@@ -148,6 +148,7 @@
+Index: cups-1.3.11/scheduler/main.c
+===================================================================
+--- cups-1.3.11.orig/scheduler/main.c
++++ cups-1.3.11/scheduler/main.c
+@@ -172,6 +172,7 @@ main(int argc, /* I - Number of comm
*/
fg = 0;
+ ppds_generation = 0;
- for (i = 1; i < argc; i ++)
- if (argv[i][0] == '-')
-@@ -219,6 +220,10 @@
- #endif /* HAVE_LAUNCHD */
+ #ifdef HAVE_LAUNCHD
+ if (getenv("CUPSD_LAUNCHD"))
+@@ -272,6 +273,10 @@ main(int argc, /* I - Number of comm
+ fg = 1;
break;
+ case 'P' : /* generate ppds only */
@@ -19,7 +21,7 @@
default : /* Unknown option */
_cupsLangPrintf(stderr, _("cupsd: Unknown option \"%c\" - "
"aborting!\n"), *opt);
-@@ -287,17 +292,18 @@
+@@ -340,17 +345,18 @@ main(int argc, /* I - Number of comm
perror("cupsd");
return (1);
}
@@ -39,9 +41,9 @@
+ } else
+ return (0);
}
- }
-@@ -482,6 +488,9 @@
+ #ifdef __OpenBSD__
+@@ -625,6 +631,9 @@ main(int argc, /* I - Number of comm
}
#endif /* __sgi */
@@ -51,7 +53,7 @@
/*
* Initialize authentication certificates...
*/
-@@ -2260,13 +2269,14 @@
+@@ -2031,13 +2040,14 @@ static void
usage(int status) /* O - Exit status */
{
_cupsLangPuts(status ? stderr : stdout,
@@ -68,21 +70,25 @@
exit(status);
}
---- cups-1.2.0/scheduler/cupsd.h.orig 2006-03-18 04:05:12.000000000 +0100
-+++ cups-1.2.0/scheduler/cupsd.h 2006-03-29 17:30:47.000000000 +0200
-@@ -202,6 +202,8 @@
- char *envp[], int infd, int outfd,
- int errfd, int backfd, int root, int *pid);
+Index: cups-1.3.11/scheduler/cupsd.h
+===================================================================
+--- cups-1.3.11.orig/scheduler/cupsd.h
++++ cups-1.3.11/scheduler/cupsd.h
+@@ -180,6 +180,8 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuota
+
+
+VAR int ppds_generation;/* Generate ppds.dat and exit() */
+
/*
- * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $".
---- cups-1.2.0/scheduler/conf.c.orig 2006-03-14 12:54:45.000000000 +0100
-+++ cups-1.2.0/scheduler/conf.c 2006-03-29 17:30:47.000000000 +0200
-@@ -716,6 +716,9 @@
- TempDir, strerror(errno));
+ * Prototypes...
+Index: cups-1.3.11/scheduler/conf.c
+===================================================================
+--- cups-1.3.11.orig/scheduler/conf.c
++++ cups-1.3.11/scheduler/conf.c
+@@ -941,6 +941,9 @@ cupsdReadConfiguration(void)
+ return (0);
}
+ if (ppds_generation > 0)
++++++ cups-1.2.11-testppd_filename.patch ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:28.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:28.000000000 +0100
@@ -1,6 +1,8 @@
---- cups-1.2.11/systemv/cupstestppd.c.orig 2007-05-10 13:47:54.000000000 +0200
-+++ cups-1.2.11/systemv/cupstestppd.c 2007-05-10 13:53:56.000000000 +0200
-@@ -92,6 +92,7 @@
+Index: cups-1.3.11/systemv/cupstestppd.c
+===================================================================
+--- cups-1.3.11.orig/systemv/cupstestppd.c
++++ cups-1.3.11/systemv/cupstestppd.c
+@@ -129,6 +129,7 @@ main(int argc, /* I - Number of comm
int i, j, k, m, n; /* Looping vars */
int len; /* Length of option name */
char *opt; /* Option character */
@@ -8,7 +10,7 @@
const char *ptr; /* Pointer into string */
int files; /* Number of files */
int verbose; /* Want verbose output? */
-@@ -315,6 +316,7 @@
+@@ -375,6 +376,7 @@ main(int argc, /* I - Number of comm
errors = 0;
ppdversion = 43;
@@ -16,12 +18,12 @@
if (verbose > 0)
_cupsLangPuts(stdout,
-@@ -1545,7 +1547,7 @@
-
+@@ -1171,7 +1173,7 @@ main(int argc, /* I - Number of comm
+
if (verbose >= 0)
{
- check_basics(argv[i]);
+ check_basics(ppdfilename);
- /*
- * Look for default keywords with no corresponding option...
+ if (warn & WARN_CONSTRAINTS)
+ errors = check_constraints(ppd, errors, verbose, 1);
++++++ cups-1.3.3-mime.patch ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:29.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:29.000000000 +0100
@@ -1,6 +1,8 @@
---- cups-1.3.3/conf/mime.types.orig 2007-07-11 23:46:42.000000000 +0200
-+++ cups-1.3.3/conf/mime.types 2007-10-15 18:39:02.000000000 +0200
-@@ -75,6 +75,8 @@
+Index: cups-1.3.11/conf/mime.types
+===================================================================
+--- cups-1.3.11.orig/conf/mime.types
++++ cups-1.3.11/conf/mime.types
+@@ -75,6 +75,8 @@ application/postscript ai eps ps string
contains(0,4096,"LANGUAGE = POSTSCRIPT") \
(contains(0,4096,<0a>%!) + \
!contains(0,4096,"ENTER LANGUAGE")))
@@ -9,11 +11,13 @@
application/vnd.hp-HPGL hpgl \
string(0,<1B>E<1B>%0B) \
string(0,<1B>%-1B) string(0,<201B>)\
---- cups-1.3.3/conf/mime.convs.in.orig 2007-08-02 19:58:59.000000000 +0200
-+++ cups-1.3.3/conf/mime.convs.in 2007-10-15 18:40:15.000000000 +0200
+Index: cups-1.3.11/conf/mime.convs.in
+===================================================================
+--- cups-1.3.11.orig/conf/mime.convs.in
++++ cups-1.3.11/conf/mime.convs.in
@@ -40,6 +40,8 @@
- application/pdf application/postscript 33 pdftops
+ application/pdf application/vnd.cups-postscript 66 pdftops
application/postscript application/vnd.cups-postscript 66 pstops
+#application/x-dvi application/postscript 50 dvitops
+application/netscape-ps application/vnd.cups-postscript 33 ogonki
++++++ cups-1.3.3-pswrite.patch ++++++
--- /var/tmp/diff_new_pack.RsxPmc/_old 2009-12-04 10:20:29.000000000 +0100
+++ /var/tmp/diff_new_pack.RsxPmc/_new 2009-12-04 10:20:29.000000000 +0100
@@ -1,6 +1,8 @@
---- cups-1.3.3/conf/mime.types.orig 2007-10-15 18:42:58.000000000 +0200
-+++ cups-1.3.3/conf/mime.types 2007-10-15 18:44:56.000000000 +0200
-@@ -76,7 +76,10 @@
+Index: cups-1.3.11/conf/mime.types
+===================================================================
+--- cups-1.3.11.orig/conf/mime.types
++++ cups-1.3.11/conf/mime.types
+@@ -76,7 +76,10 @@ application/postscript ai eps ps string
(contains(0,4096,<0a>%!) + \
!contains(0,4096,"ENTER LANGUAGE")))
#application/x-dvi dvi string(0,<F702>)
@@ -12,10 +14,12 @@
application/vnd.hp-HPGL hpgl \
string(0,<1B>E<1B>%0B) \
string(0,<1B>%-1B) string(0,<201B>)\
---- cups-1.3.3/conf/mime.convs.in.orig 2007-10-15 18:42:58.000000000 +0200
-+++ cups-1.3.3/conf/mime.convs.in 2007-10-15 18:46:39.000000000 +0200
+Index: cups-1.3.11/conf/mime.convs.in
+===================================================================
+--- cups-1.3.11.orig/conf/mime.convs.in
++++ cups-1.3.11/conf/mime.convs.in
@@ -41,7 +41,9 @@
- application/pdf application/postscript 33 pdftops
+ application/pdf application/vnd.cups-postscript 66 pdftops
application/postscript application/vnd.cups-postscript 66 pstops
#application/x-dvi application/postscript 50 dvitops
-application/netscape-ps application/vnd.cups-postscript 33 ogonki
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org