rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- 1.4.0.

Browse Source
This commit is contained in:
Tim Waugh 2009-08-28 21:06:47 +00:00
parent b18bf2ffda
commit dd27f804a6
14 changed files with 33 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -38,3 +38,4 @@ cups-1.4b1-source.tar.bz2
cups-1.4b2-source.tar.bz2 cups-1.4b2-source.tar.bz2
cups-1.4b2-svn8404-source.tar.bz2 cups-1.4b2-svn8404-source.tar.bz2
cups-1.4rc1-source.tar.bz2 cups-1.4rc1-source.tar.bz2
cups-1.4.0-source.tar.bz2

42
cups-avahi.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.4rc1/backend/dnssd.c.avahi cups-1.4rc1/backend/dnssd.c diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
--- cups-1.4rc1/backend/dnssd.c.avahi 2009-07-29 14:00:53.767272320 +0100 --- cups-1.4.0/backend/dnssd.c.avahi 2009-08-07 23:27:12.000000000 +0100
+++ cups-1.4rc1/backend/dnssd.c 2009-07-29 14:01:36.574271697 +0100 +++ cups-1.4.0/backend/dnssd.c 2009-08-28 21:44:27.262137662 +0100
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
* exec_backend() - Execute the backend that corresponds to the * exec_backend() - Execute the backend that corresponds to the
* resolved service name. * resolved service name.
@ -775,10 +775,10 @@ diff -up cups-1.4rc1/backend/dnssd.c.avahi cups-1.4rc1/backend/dnssd.c
/* /*
* 'sigterm_handler()' - Handle termination signals... * 'sigterm_handler()' - Handle termination signals...
*/ */
diff -up cups-1.4rc1/config.h.in.avahi cups-1.4rc1/config.h.in diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
--- cups-1.4rc1/config.h.in.avahi 2009-05-14 21:48:55.000000000 +0100 --- cups-1.4.0/config.h.in.avahi 2009-06-10 16:51:21.000000000 +0100
+++ cups-1.4rc1/config.h.in 2009-07-29 14:01:36.575271644 +0100 +++ cups-1.4.0/config.h.in 2009-08-28 21:44:27.265137528 +0100
@@ -344,6 +344,13 @@ @@ -336,6 +336,13 @@
/* /*
@ -792,9 +792,9 @@ diff -up cups-1.4rc1/config.h.in.avahi cups-1.4rc1/config.h.in
* Do we have <sys/ioctl.h>? * Do we have <sys/ioctl.h>?
*/ */
diff -up cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi cups-1.4rc1/config-scripts/cups-dnssd.m4 diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
--- cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi 2009-02-10 17:05:35.000000000 +0000 --- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi 2009-02-10 17:05:35.000000000 +0000
+++ cups-1.4rc1/config-scripts/cups-dnssd.m4 2009-07-29 14:01:36.575271644 +0100 +++ cups-1.4.0/config-scripts/cups-dnssd.m4 2009-08-28 21:44:27.263138688 +0100
@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn
DNSSDLIBS="" DNSSDLIBS=""
DNSSD_BACKEND="" DNSSD_BACKEND=""
@ -817,10 +817,10 @@ diff -up cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi cups-1.4rc1/config-scrip
if test x$enable_dnssd != xno; then if test x$enable_dnssd != xno; then
AC_CHECK_HEADER(dns_sd.h, [ AC_CHECK_HEADER(dns_sd.h, [
case "$uname" in case "$uname" in
diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
--- cups-1.4rc1/cups/http-support.c.avahi 2009-04-30 23:15:05.000000000 +0100 --- cups-1.4.0/cups/http-support.c.avahi 2009-06-12 01:21:58.000000000 +0100
+++ cups-1.4rc1/cups/http-support.c 2009-07-29 14:01:36.577396783 +0100 +++ cups-1.4.0/cups/http-support.c 2009-08-28 21:44:27.267137550 +0100
@@ -54,6 +54,11 @@ @@ -55,6 +55,11 @@
# include <dns_sd.h> # include <dns_sd.h>
# include <poll.h> # include <poll.h>
#endif /* HAVE_DNSSD */ #endif /* HAVE_DNSSD */
@ -832,7 +832,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
/* /*
@@ -120,6 +125,24 @@ static void resolve_callback(DNSService @@ -121,6 +126,24 @@ static void resolve_callback(DNSService
void *context); void *context);
#endif /* HAVE_DNSSD */ #endif /* HAVE_DNSSD */
@ -857,7 +857,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
/* /*
* 'httpAssembleURI()' - Assemble a uniform resource identifier from its * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
@@ -1348,15 +1371,26 @@ _httpResolveURI( @@ -1349,15 +1372,26 @@ _httpResolveURI(
if (strstr(hostname, "._tcp")) if (strstr(hostname, "._tcp"))
{ {
@ -886,7 +886,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
if (logit) if (logit)
@@ -1394,8 +1428,13 @@ _httpResolveURI( @@ -1395,8 +1429,13 @@ _httpResolveURI(
if (domain) if (domain)
*domain++ = '\0'; *domain++ = '\0';
@ -908,7 +908,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
{ {
localref = ref; localref = ref;
@@ -1457,6 +1497,36 @@ _httpResolveURI( @@ -1486,6 +1526,36 @@ _httpResolveURI(
DNSServiceRefDeallocate(ref); DNSServiceRefDeallocate(ref);
} }
@ -945,7 +945,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
if (logit) if (logit)
{ {
@@ -1468,13 +1538,13 @@ _httpResolveURI( @@ -1497,13 +1567,13 @@ _httpResolveURI(
fputs("STATE: -connecting-to-device\n", stderr); fputs("STATE: -connecting-to-device\n", stderr);
} }
@ -961,7 +961,7 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
if (logit && !uri) if (logit && !uri)
_cupsLangPuts(stderr, _("Unable to find printer!\n")); _cupsLangPuts(stderr, _("Unable to find printer!\n"));
@@ -1679,6 +1749,105 @@ resolve_callback( @@ -1708,6 +1778,105 @@ resolve_callback(
} }
#endif /* HAVE_DNSSD */ #endif /* HAVE_DNSSD */
@ -1066,4 +1066,4 @@ diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
+ +
/* /*
* End of "$Id: http-support.c 8585 2009-04-30 22:15:05Z mike $". * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".

144
cups-str3229.patch
View File

@ -1,144 +0,0 @@
diff -up cups-1.4rc1/templates/add-printer.tmpl.str3229 cups-1.4rc1/templates/add-printer.tmpl
--- cups-1.4rc1/templates/add-printer.tmpl.str3229 2008-09-20 04:33:59.000000000 +0100
+++ cups-1.4rc1/templates/add-printer.tmpl 2009-06-18 18:58:12.242510800 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">Sharing:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Share This Printer</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/de/add-printer.tmpl.str3229 cups-1.4rc1/templates/de/add-printer.tmpl
--- cups-1.4rc1/templates/de/add-printer.tmpl.str3229 2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/add-printer.tmpl 2009-06-18 18:58:12.255510590 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">Freigabe:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Diesen Drucker freigeben</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/de/modify-printer.tmpl.str3229 cups-1.4rc1/templates/de/modify-printer.tmpl
--- cups-1.4rc1/templates/de/modify-printer.tmpl.str3229 2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/modify-printer.tmpl 2009-06-18 18:58:12.258635708 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">Freigabe:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Diesen Drucker freigeben</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/es/add-printer.tmpl.str3229 cups-1.4rc1/templates/es/add-printer.tmpl
--- cups-1.4rc1/templates/es/add-printer.tmpl.str3229 2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/add-printer.tmpl 2009-06-18 18:58:12.267511070 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">Compartici&oacute;n:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Compartir esta impresora</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/es/modify-printer.tmpl.str3229 cups-1.4rc1/templates/es/modify-printer.tmpl
--- cups-1.4rc1/templates/es/modify-printer.tmpl.str3229 2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/modify-printer.tmpl 2009-06-18 18:58:12.270511552 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">Compartida:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Compartir esta impresora</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/ja/add-printer.tmpl.str3229 cups-1.4rc1/templates/ja/add-printer.tmpl
--- cups-1.4rc1/templates/ja/add-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/add-printer.tmpl 2009-06-18 18:58:12.242510800 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">共有:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
このプリンターを共有する</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/ja/modify-printer.tmpl.str3229 cups-1.4rc1/templates/ja/modify-printer.tmpl
--- cups-1.4rc1/templates/ja/modify-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/modify-printer.tmpl 2009-06-18 18:58:12.243635944 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">共有:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
このプリンターを共有する</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/modify-printer.tmpl.str3229 cups-1.4rc1/templates/modify-printer.tmpl
--- cups-1.4rc1/templates/modify-printer.tmpl.str3229 2008-09-20 04:33:59.000000000 +0100
+++ cups-1.4rc1/templates/modify-printer.tmpl 2009-06-18 18:58:12.246635665 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">Sharing:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Share This Printer</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/pl/add-printer.tmpl.str3229 cups-1.4rc1/templates/pl/add-printer.tmpl
--- cups-1.4rc1/templates/pl/add-printer.tmpl.str3229 2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/add-printer.tmpl 2009-06-18 18:58:12.261635679 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">Współdzielenie:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Współdzielenie tej drukarki</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/pl/modify-printer.tmpl.str3229 cups-1.4rc1/templates/pl/modify-printer.tmpl
--- cups-1.4rc1/templates/pl/modify-printer.tmpl.str3229 2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/modify-printer.tmpl 2009-06-18 18:58:12.264511505 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">Współdzielenie:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Share This Printer</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/ru/add-printer.tmpl.str3229 cups-1.4rc1/templates/ru/add-printer.tmpl
--- cups-1.4rc1/templates/ru/add-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/add-printer.tmpl 2009-06-18 18:58:12.249511736 +0100
@@ -29,7 +29,7 @@
</TR>
<TR>
<TH CLASS="label">Совместный доступ:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Разрешить совместный доступ к этому принтеру</TD>
</TR>
<TR>
diff -up cups-1.4rc1/templates/ru/modify-printer.tmpl.str3229 cups-1.4rc1/templates/ru/modify-printer.tmpl
--- cups-1.4rc1/templates/ru/modify-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/modify-printer.tmpl 2009-06-18 18:58:12.252511667 +0100
@@ -23,7 +23,7 @@
</TR>
<TR>
<TH CLASS="label">Совместный доступ:</TH>
-<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}">
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
Разрешить совместный доступ к этому принтеру</TD>
</TR>
<TR>

36
cups-str3231.patch
View File

@ -1,36 +0,0 @@
diff -up cups-1.4rc1/cups/request.c.str3231 cups-1.4rc1/cups/request.c
--- cups-1.4rc1/cups/request.c.str3231 2009-06-29 10:07:23.568486428 +0100
+++ cups-1.4rc1/cups/request.c 2009-06-29 10:07:44.867219805 +0100
@@ -266,9 +266,9 @@ cupsDoIORequest(http_t *http, /* I -
DEBUG_printf(("2cupsDoIORequest: status=%d", status));
- if (status == HTTP_FORBIDDEN || status == HTTP_ERROR ||
- status >= HTTP_SERVER_ERROR)
+ if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
{
+ httpFlush(http);
_cupsSetHTTPError(status);
break;
}
diff -up cups-1.4rc1/cups/http.c.length cups-1.4rc1/cups/http.c
--- cups-1.4rc1/cups/http.c.length 2009-07-01 12:00:16.591298309 +0100
+++ cups-1.4rc1/cups/http.c 2009-07-01 12:00:43.494298468 +0100
@@ -3143,6 +3145,8 @@ http_upgrade(http_t *http) /* I - Conne
DEBUG_printf(("7http_upgrade(%p)", http));
+ httpFlush(http);
+
/*
* Copy the HTTP data to a local variable so we can do the OPTIONS
* request without interfering with the existing request data...
@@ -3170,8 +3174,6 @@ http_upgrade(http_t *http) /* I - Conne
while (httpUpdate(http) == HTTP_CONTINUE);
}
- httpFlush(http);
-
/*
* Restore the HTTP request data...
*/

204
cups-str3244.patch
View File

@ -1,204 +0,0 @@
diff -up cups-1.4rc1/templates/de/option-boolean.tmpl.str3244 cups-1.4rc1/templates/de/option-boolean.tmpl
--- cups-1.4rc1/templates/de/option-boolean.tmpl.str3244 2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-boolean.tmpl 2009-07-01 14:07:00.333422971 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/de/option-pickmany.tmpl
--- cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244 2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-pickmany.tmpl 2009-07-01 14:07:00.333422971 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/de/option-pickone.tmpl.str3244 cups-1.4rc1/templates/de/option-pickone.tmpl
--- cups-1.4rc1/templates/de/option-pickone.tmpl.str3244 2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-pickone.tmpl 2009-07-01 14:07:00.334423521 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/es/option-boolean.tmpl.str3244 cups-1.4rc1/templates/es/option-boolean.tmpl
--- cups-1.4rc1/templates/es/option-boolean.tmpl.str3244 2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-boolean.tmpl 2009-07-01 14:07:00.335423309 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/es/option-pickmany.tmpl
--- cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244 2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-pickmany.tmpl 2009-07-01 14:07:00.335423309 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/es/option-pickone.tmpl.str3244 cups-1.4rc1/templates/es/option-pickone.tmpl
--- cups-1.4rc1/templates/es/option-pickone.tmpl.str3244 2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-pickone.tmpl 2009-07-01 14:07:00.336423193 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ja/option-boolean.tmpl
--- cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-boolean.tmpl 2009-07-01 14:07:00.336423193 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickmany.tmpl
--- cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-pickmany.tmpl 2009-07-01 14:07:00.337423282 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickone.tmpl
--- cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-pickone.tmpl 2009-07-01 14:07:00.337423282 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/option-boolean.tmpl.str3244 cups-1.4rc1/templates/option-boolean.tmpl
--- cups-1.4rc1/templates/option-boolean.tmpl.str3244 2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-boolean.tmpl 2009-07-01 14:07:00.338423040 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/option-pickmany.tmpl
--- cups-1.4rc1/templates/option-pickmany.tmpl.str3244 2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-pickmany.tmpl 2009-07-01 14:07:00.338423040 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/option-pickone.tmpl.str3244 cups-1.4rc1/templates/option-pickone.tmpl
--- cups-1.4rc1/templates/option-pickone.tmpl.str3244 2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-pickone.tmpl 2009-07-01 14:07:00.339298478 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244 cups-1.4rc1/templates/pl/option-boolean.tmpl
--- cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244 2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-boolean.tmpl 2009-07-01 14:07:00.340298367 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickmany.tmpl
--- cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244 2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-pickmany.tmpl 2009-07-01 14:07:00.340298367 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickone.tmpl
--- cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244 2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-pickone.tmpl 2009-07-01 14:07:00.344297815 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ru/option-boolean.tmpl
--- cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-boolean.tmpl 2009-07-01 14:07:00.345423743 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
</TD>
</TR>
diff -up cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickmany.tmpl
--- cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-pickmany.tmpl 2009-07-01 14:07:00.345423743 +0100
@@ -1,6 +1,6 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT></TD>
</TR>
diff -up cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickone.tmpl
--- cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244 2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-pickone.tmpl 2009-07-01 14:07:00.346423150 +0100
@@ -1,7 +1,7 @@
<TR>
<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
</SELECT>
{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
<TR><TH CLASS="sublabel">{paramtext}:</TH>

47
cups-str3253.patch
View File

@ -1,47 +0,0 @@
diff -up cups-1.4rc1/scheduler/job.c.str3253 cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.str3253 2009-07-15 11:19:37.613132688 +0100
+++ cups-1.4rc1/scheduler/job.c 2009-07-15 11:51:42.073132844 +0100
@@ -3443,11 +3443,8 @@ load_job_cache(const char *filename) /*
{
cupsArrayAdd(Jobs, job);
- if (job->state_value <= IPP_JOB_STOPPED)
- {
- cupsArrayAdd(ActiveJobs, job);
- cupsdLoadJob(job);
- }
+ if (job->state_value <= IPP_JOB_STOPPED && cupsdLoadJob(job))
+ cupsArrayAdd(ActiveJobs, job);
job = NULL;
}
@@ -3699,18 +3696,19 @@ load_request_root(void)
* Load the job...
*/
- cupsdLoadJob(job);
-
- /*
- * Insert the job into the array, sorting by job priority and ID...
- */
+ if (cupsdLoadJob(job))
+ {
+ /*
+ * Insert the job into the array, sorting by job priority and ID...
+ */
- cupsArrayAdd(Jobs, job);
+ cupsArrayAdd(Jobs, job);
- if (job->state_value <= IPP_JOB_STOPPED)
- cupsArrayAdd(ActiveJobs, job);
- else
- unload_job(job);
+ if (job->state_value <= IPP_JOB_STOPPED)
+ cupsArrayAdd(ActiveJobs, job);
+ else
+ unload_job(job);
+ }
}
cupsDirClose(dir);

12
cups-str3254.patch
View File

@ -1,12 +0,0 @@
diff -up cups-1.4rc1/scheduler/ipp.c.str3254 cups-1.4rc1/scheduler/ipp.c
--- cups-1.4rc1/scheduler/ipp.c.str3254 2009-07-15 11:11:32.346008322 +0100
+++ cups-1.4rc1/scheduler/ipp.c 2009-07-15 11:12:14.411132519 +0100
@@ -11170,7 +11170,7 @@ url_encode_string(const char *s, /* I -
while (*s && bufptr < bufend)
{
- if (*s == ' ' || *s == '%')
+ if (*s == ' ' || *s == '%' || *s == '+')
{
if (bufptr >= (bufend - 2))
break;

26
cups-str3258.patch
View File

@ -1,26 +0,0 @@
diff -up cups-1.4rc1/scheduler/ipp.c.str3258 cups-1.4rc1/scheduler/ipp.c
--- cups-1.4rc1/scheduler/ipp.c.str3258 2009-07-15 09:58:15.559299247 +0100
+++ cups-1.4rc1/scheduler/ipp.c 2009-07-15 09:58:47.981299548 +0100
@@ -1721,8 +1721,7 @@ add_job(cupsd_client_t *con, /* I - Cl
attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
"job-hold-until", NULL, val);
}
- if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
- !(printer->type & CUPS_PRINTER_REMOTE))
+ if (attr && strcmp(attr->values[0].string.text, "no-hold"))
{
/*
* Hold job until specified time...
diff -up cups-1.4rc1/scheduler/job.c.str3258 cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.str3258 2009-07-15 09:58:15.627173602 +0100
+++ cups-1.4rc1/scheduler/job.c 2009-07-15 09:58:47.984298957 +0100
@@ -3095,7 +3095,8 @@ get_options(cupsd_job_t *job, /* I - Jo
attr->value_tag == IPP_TAG_BEGIN_COLLECTION) /* Not yet supported */
continue;
- if (!strncmp(attr->name, "time-", 5))
+ if (!strncmp(attr->name, "time-", 5) ||
+ !strcmp(attr->name, "job-hold-until"))
continue;
if (!strncmp(attr->name, "job-", 4) &&

18
cups-str3259.patch
View File

@ -1,18 +0,0 @@
diff -up cups-1.4rc1/backend/ieee1284.c.str3259 cups-1.4rc1/backend/ieee1284.c
--- cups-1.4rc1/backend/ieee1284.c.str3259 2008-12-11 23:01:44.000000000 +0000
+++ cups-1.4rc1/backend/ieee1284.c 2009-07-15 10:08:13.147173947 +0100
@@ -306,6 +306,14 @@ backendGetDeviceID(
mfg = temp;
}
+ if (!strncasecmp(mdl, mfg, strlen(mfg)))
+ {
+ mdl += strlen(mfg);
+
+ while (isspace(*mdl & 255))
+ mdl ++;
+ }
+
/*
* Generate the device URI from the manufacturer, make_model, and
* serial number strings.

47
cups-str3266.patch
View File

@ -1,47 +0,0 @@
diff -up cups-1.4rc1/backend/ieee1284.c.device-id cups-1.4rc1/backend/ieee1284.c
--- cups-1.4rc1/backend/ieee1284.c.device-id 2009-07-18 18:25:38.355769382 +0100
+++ cups-1.4rc1/backend/ieee1284.c 2009-07-18 18:25:43.844894365 +0100
@@ -196,12 +196,19 @@ backendGetDeviceID(
* and then limit the length to the size of our buffer...
*/
- if (length > (device_id_size - 2))
+ if (length > device_id_size)
length = (((unsigned)device_id[1] & 255) << 8) +
((unsigned)device_id[0] & 255);
- if (length > (device_id_size - 2))
- length = device_id_size - 2;
+ if (length > device_id_size)
+ length = device_id_size;
+
+ /*
+ * The length field counts the number of bytes in the string
+ * including the length field itself (2 bytes).
+ */
+
+ length -= 2;
/*
* Copy the device ID text to the beginning of the buffer and
diff -up cups-1.4rc1/backend/usb-libusb.c.device-id cups-1.4rc1/backend/usb-libusb.c
--- cups-1.4rc1/backend/usb-libusb.c.device-id 2009-01-14 19:46:43.000000000 +0000
+++ cups-1.4rc1/backend/usb-libusb.c 2009-07-18 18:25:43.845895048 +0100
@@ -418,12 +418,14 @@ get_device_id(usb_printer_t *printer, /*
* and then limit the length to the size of our buffer...
*/
- if (length > (bufsize - 2))
+ if (length > bufsize)
length = (((unsigned)buffer[1] & 255) << 8) +
((unsigned)buffer[0] & 255);
- if (length > (bufsize - 2))
- length = bufsize - 2;
+ if (length > bufsize)
+ length = bufsize;
+
+ length -= 2;
/*
* Copy the device ID text to the beginning of the buffer and

14
cups-str3272.patch
View File

@ -1,14 +0,0 @@
diff -up cups-1.4rc1/backend/dnssd.c.str3272 cups-1.4rc1/backend/dnssd.c
--- cups-1.4rc1/backend/dnssd.c.str3272 2009-04-14 19:14:02.000000000 +0100
+++ cups-1.4rc1/backend/dnssd.c 2009-07-29 13:56:55.643396809 +0100
@@ -153,8 +153,8 @@ main(int argc, /* I - Number of comm
memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
- action.sa_handler = SIG_IGN;
- sigaction(SIGTERM, &action, sigterm_handler);
+ action.sa_handler = sigterm_handler;
+ sigaction(SIGTERM, &action, NULL);
#else
signal(SIGTERM, sigterm_handler);
#endif /* HAVE_SIGSET */

12
cups-str3277.patch
View File

@ -1,12 +0,0 @@
diff -up cups-1.4rc1/filter/bannertops.c.str3277 cups-1.4rc1/filter/bannertops.c
--- cups-1.4rc1/filter/bannertops.c.str3277 2009-05-07 00:18:01.000000000 +0100
+++ cups-1.4rc1/filter/bannertops.c 2009-08-04 13:18:17.626076410 +0100
@@ -593,7 +593,7 @@ write_banner(banner_file_t *banner, /* I
printf("%.1f %.1f translate\n", PageLeft, PageBottom);
else
printf("%.1f %.1f translate\n", PageWidth - PageRight,
- PageLength - PageRight);
+ PageLength - PageTop);
puts("0 setgray");
y = info_top;

35
cups.spec
View File

@ -1,7 +1,6 @@
%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4) %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%define pre rc1
%define initdir /etc/rc.d/init.d %define initdir /etc/rc.d/init.d
%define use_alternatives 1 %define use_alternatives 1
%define lspp 1 %define lspp 1
@ -9,11 +8,11 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4 Version: 1.4.0
Release: 0.%{pre}.21%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
Source1: cups.init Source1: cups.init
Source2: cupsprinter.png Source2: cupsprinter.png
Source3: cups-libusb.rules Source3: cups-libusb.rules
@ -48,21 +47,11 @@ Patch20: cups-logrotate.patch
Patch21: cups-usb-paperout.patch Patch21: cups-usb-paperout.patch
Patch22: cups-build.patch Patch22: cups-build.patch
Patch23: cups-res_init.patch Patch23: cups-res_init.patch
Patch24: cups-str3229.patch
Patch25: cups-filter-debug.patch Patch25: cups-filter-debug.patch
Patch26: cups-str3231.patch
Patch27: cups-str3244.patch
Patch28: cups-str3258.patch
Patch29: cups-str3259.patch
Patch30: cups-uri-compat.patch Patch30: cups-uri-compat.patch
Patch31: cups-str3254.patch
Patch32: cups-str3253.patch
Patch33: cups-str3266.patch
Patch34: cups-str3262.patch Patch34: cups-str3262.patch
Patch35: cups-cups-get-classes.patch Patch35: cups-cups-get-classes.patch
Patch36: cups-str3272.patch
Patch37: cups-avahi.patch Patch37: cups-avahi.patch
Patch38: cups-str3277.patch
Patch39: cups-str3284.patch Patch39: cups-str3284.patch
Patch40: cups-str3285.patch Patch40: cups-str3285.patch
Patch41: cups-str3279.patch Patch41: cups-str3279.patch
@ -198,7 +187,7 @@ UNIX® operating systems. This is the package that provices a PHP
module. module.
%prep %prep
%setup -q -n %{name}-%{version}%{?pre}%{?svn} %setup -q -n %{name}-%{version}
%patch1 -p1 -b .no-gzip-man %patch1 -p1 -b .no-gzip-man
%patch2 -p1 -b .system-auth %patch2 -p1 -b .system-auth
%patch3 -p1 -b .multilib %patch3 -p1 -b .multilib
@ -220,21 +209,11 @@ module.
%patch21 -p1 -b .usb-paperout %patch21 -p1 -b .usb-paperout
%patch22 -p1 -b .build %patch22 -p1 -b .build
%patch23 -p1 -b .res_init %patch23 -p1 -b .res_init
%patch24 -p1 -b .str3229
%patch25 -p1 -b .filter-debug %patch25 -p1 -b .filter-debug
%patch26 -p1 -b .str3231
%patch27 -p1 -b .str3244
%patch28 -p1 -b .str3258
%patch29 -p1 -b .str3259
%patch30 -p1 -b .uri-compat %patch30 -p1 -b .uri-compat
%patch31 -p1 -b .str3254
%patch32 -p1 -b .str3253
%patch33 -p1 -b .str3266
%patch34 -p1 -b .str3262 %patch34 -p1 -b .str3262
%patch35 -p1 -b .cups-get-classes %patch35 -p1 -b .cups-get-classes
%patch36 -p1 -b .str3272
%patch37 -p1 -b .avahi %patch37 -p1 -b .avahi
%patch38 -p1 -b .str3277
%patch39 -p1 -b .str3284 %patch39 -p1 -b .str3284
%patch40 -p1 -b .str3285 %patch40 -p1 -b .str3285
%patch41 -p1 -b .str3279 %patch41 -p1 -b .str3279
@ -449,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/portreserve/%{name} %config(noreplace) %{_sysconfdir}/portreserve/%{name}
%dir %{_datadir}/%{name}/www %dir %{_datadir}/%{name}/www
%dir %{_datadir}/%{name}/www/es %dir %{_datadir}/%{name}/www/es
%dir %{_datadir}/%{name}/www/eu
%dir %{_datadir}/%{name}/www/ja %dir %{_datadir}/%{name}/www/ja
%dir %{_datadir}/%{name}/www/pl %dir %{_datadir}/%{name}/www/pl
%dir %{_datadir}/%{name}/www/ru %dir %{_datadir}/%{name}/www/ru
@ -459,6 +439,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt %config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt
%config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/eu/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html %config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html
@ -493,6 +474,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_datadir}/cups/templates/*.tmpl %config(noreplace) %{_datadir}/cups/templates/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/de/*.tmpl %config(noreplace) %{_datadir}/cups/templates/de/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/es/*.tmpl %config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/eu/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl %config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl %config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl %config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl
@ -538,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Aug 28 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.0-1
- 1.4.0.
* Thu Aug 27 2009 Warren Togami <wtogami@redhat.com> 1:1.4-0.rc1.21 * Thu Aug 27 2009 Warren Togami <wtogami@redhat.com> 1:1.4-0.rc1.21
- rebuild - rebuild

2
sources
View File

@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
79948fc1a46e1a3f7aabe5a76fb99e8e cups-1.4rc1-source.tar.bz2 bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2