rpms/cups/devel cups-svn5754.patch, NONE, 1.1 cups.spec, 1.228, 1.229 cups-svn5737.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 19 11:18:38 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15584
Modified Files:
cups.spec
Added Files:
cups-svn5754.patch
Removed Files:
cups-svn5737.patch
Log Message:
* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-21
- Sync with svn5754. Fixes bug #198987, bug #195532, bug #130118.
cups-svn5754.patch:
CHANGES.txt | 145 +
Makedefs.in | 10
backend/Dependencies | 39
backend/Makefile | 40
backend/backend-private.h | 73
backend/easysw-firewire-design.txt | 70
backend/easysw-firewire-linux.txt | 35
backend/ieee1284.c | 77
backend/ieee1394-linux.c | 877 --------
backend/ieee1394.c | 267 --
backend/ieee1394.h | 103
backend/ipp.c | 9
backend/parallel.c | 231 --
backend/runloop.c | 258 ++
backend/serial.c | 293 +-
backend/snmp.c | 37
backend/socket.c | 299 --
backend/test1284.c | 9
backend/usb-darwin.c | 6
backend/usb-unix.c | 301 --
backend/usb.c | 25
berkeley/lpq.c | 6
berkeley/lprm.c | 35
cgi-bin/help-index.c | 6
config-scripts/cups-compiler.m4 | 66
config-scripts/cups-defaults.m4 | 44
config-scripts/cups-directories.m4 | 6
config-scripts/cups-image.m4 | 24
config-scripts/cups-network.m4 | 6
config-scripts/cups-sharedlibs.m4 | 48
config-scripts/cups-ssl.m4 | 5
config.h.in | 11
configure.in | 11
cups-config.in | 14
cups/Makefile | 10
cups/adminutil.c | 22
cups/dest.c | 55
cups/emit.c | 27
cups/encode.c | 58
cups/http-addrlist.c | 20
cups/http.c | 35
cups/http.h | 14
cups/ipp-private.h | 17
cups/ipp.c | 8
cups/language.c | 21
cups/mark.c | 11
cups/testhttp.c | 22
cups/testipp.c | 19
cups/testppd.c | 57
cups/util.c | 36
doc/Makefile | 18
doc/de/index.html.in | 143 +
doc/help/policies.html | 677 ++++++
doc/help/ref-mailto-conf.html | 105
doc/help/spec-raster.html | 32
filter/Makefile | 20
filter/pstops.c | 95
filter/raster.c | 683 +++---
filter/raster.h | 11
filter/rasterbench.c | 355 +++
filter/rastertolabel.c | 13
locale/Makefile | 14
locale/cups_de.po | 2821 ++++++++++++++++++++++++++
locale/cups_es.po | 482 +---
locale/cups_ja.po | 9
man/Makefile | 5
man/cupsaddsmb.man.in | 21
man/cupsd.conf.man.in | 10
man/lpadmin.man | 33
man/mailto.conf.man | 69
notifier/testnotify.c | 12
packaging/cups.list.in | 25
packaging/cups.spec.in | 23
pdftops/PSOutputDev.cxx | 2
ppd/zebracpl.ppd | 8
scheduler/Makefile | 7
scheduler/auth.c | 9
scheduler/client.c | 254 ++
scheduler/conf.c | 189 -
scheduler/conf.h | 5
scheduler/cups-polld.c | 209 +
scheduler/dirsvc.c | 110 -
scheduler/filter.c | 8
scheduler/ipp.c | 76
scheduler/job.c | 124 -
scheduler/listen.c | 8
scheduler/main.c | 8
scheduler/mime.c | 19
scheduler/printers.c | 48
scheduler/subscriptions.c | 405 +--
scheduler/subscriptions.h | 10
scheduler/testmime.c | 6
systemv/Makefile | 6
systemv/cancel.c | 7
systemv/cupsaddsmb.c | 8
systemv/lpoptions.c | 36
systemv/lpstat.c | 59
templates/Makefile | 14
templates/de/add-class.tmpl | 33
templates/de/add-printer.tmpl | 28
templates/de/admin.tmpl | 77
templates/de/choose-device.tmpl | 26
templates/de/choose-make.tmpl | 42
templates/de/choose-model.tmpl | 34
templates/de/choose-serial.tmpl | 47
templates/de/choose-uri.tmpl | 42
templates/de/class-added.tmpl | 2
templates/de/class-confirm.tmpl | 7
templates/de/class-deleted.tmpl | 1
templates/de/class-jobs-header.tmpl | 1
templates/de/class-modified.tmpl | 2
templates/de/classes-header.tmpl | 1
templates/de/classes.tmpl | 54
templates/de/edit-config.tmpl.in | 91
templates/de/error-op.tmpl | 3
templates/de/error.tmpl | 3
templates/de/header.tmpl.in | 63
templates/de/help-header.tmpl | 46
templates/de/help-printable.tmpl | 11
templates/de/job-cancel.tmpl | 1
templates/de/job-hold.tmpl | 1
templates/de/job-move.tmpl | 22
templates/de/job-moved.tmpl | 2
templates/de/job-release.tmpl | 1
templates/de/job-restart.tmpl | 1
templates/de/jobs-header.tmpl | 15
templates/de/jobs.tmpl | 42
templates/de/maintenance.tmpl | 2
templates/de/modify-class.tmpl | 34
templates/de/modify-printer.tmpl | 29
templates/de/option-boolean.tmpl | 6
templates/de/option-conflict.tmpl | 7
templates/de/option-header.tmpl | 3
templates/de/option-pickmany.tmpl | 6
templates/de/option-pickone.tmpl | 6
templates/de/option-trailer.tmpl | 5
templates/de/pager.tmpl | 7
templates/de/printer-accept.tmpl | 3
templates/de/printer-added.tmpl | 2
templates/de/printer-configured.tmpl | 2
templates/de/printer-confirm.tmpl | 7
templates/de/printer-default.tmpl | 7
templates/de/printer-deleted.tmpl | 1
templates/de/printer-jobs-header.tmpl | 1
templates/de/printer-modified.tmpl | 2
templates/de/printer-purge.tmpl | 3
templates/de/printer-reject.tmpl | 3
templates/de/printer-start.tmpl | 3
templates/de/printer-stop.tmpl | 3
templates/de/printers-header.tmpl | 1
templates/de/printers.tmpl | 64
templates/de/restart.tmpl | 1
templates/de/samba-export.tmpl | 55
templates/de/samba-exported.tmpl | 1
templates/de/search.tmpl | 13
templates/de/set-printer-options-header.tmpl | 3
templates/de/set-printer-options-trailer.tmpl | 1
templates/de/test-page.tmpl | 2
templates/de/trailer.tmpl | 21
templates/de/users.tmpl | 26
templates/ja/printers.tmpl | 2
test/ipptest.c | 31
162 files changed, 8442 insertions(+), 3849 deletions(-)
--- NEW FILE cups-svn5754.patch ---
--- release-1.2.1/backend/backend-private.h 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/backend/backend-private.h 2006-06-26 12:42:40.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $"
+ *
+ * Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Easy Software Products and are protected by Federal
+ * copyright law. Distribution and use rights are outlined in the file
+ * "LICENSE" which should have been included with this file. If this
+ * file is missing or damaged please contact Easy Software Products
+ * at:
+ *
+ * Attn: CUPS Licensing Information
+ * Easy Software Products
+ * 44141 Airport View Drive, Suite 204
+ * Hollywood, Maryland 20636 USA
+ *
+ * Voice: (301) 373-9600
+ * EMail: cups-info at cups.org
+ * WWW: http://www.cups.org
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+# define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+# include <cups/backend.h>
+# include <cups/cups.h>
+# include <cups/debug.h>
+# include <stdlib.h>
+# include <errno.h>
+# include <cups/string.h>
+# include <signal.h>
+
+
+/*
+ * C++ magic...
+ */
+
+# ifdef _cplusplus
+extern "C" {
+# endif /* _cplusplus */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int backendGetDeviceID(int fd, char *device_id, int device_id_size,
+ char *make_model, int make_model_size,
+ const char *scheme, char *uri, int uri_size);
+extern int backendGetMakeModel(const char *device_id, char *make_model,
+ int make_model_size);
+extern ssize_t backendRunLoop(int print_fd, int device_fd, int use_bc);
+
+
+# ifdef _cplusplus
+}
+# endif /* _cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $".
+ */
--- release-1.2.1/backend/Dependencies 2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/Dependencies 2006-06-26 12:42:40.000000000 +0100
@@ -9,26 +9,31 @@
lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
+pap.o: ../cups/http.h ../cups/md5.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+parallel.o: ../cups/string.h ../config.h
scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
+serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
+serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+snmp.o: ../cups/array.h ../cups/file.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+test1284.o: ../cups/language.h ../cups/debug.h
usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
usb.o: ../cups/language.h ../cups/string.h ../config.h
--- release-1.2.1/backend/easysw-firewire-design.txt 2006-07-04 17:32:11.000000000 +0100
+++ cups-1.2.x/backend/easysw-firewire-design.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
- Easy Software Products will develop an IEEE-1394, a.k.a.
- Firewire, printing interface for its Common UNIX Printing
- System ("CUPS") for initial use under the Linux operating
- system. A follow-on implementation for MacOS X is
- anticipated as well.
-
- The operating system interfaces for IEEE-1394 ports vary
- widely; the CUPS printing interface will abstract the OS
- layer to a simpler interface geared towards discovering,
- opening, reading from, writing to, and closing IEEE-1394
- printers.
-
- The initial development of the CUPS backend will be targeted
- at the EPSON Stylus Pro 10000 large format printer, which
- requires the bandwidth provided by Firewire in order to
- print at full speed. This printer supports printing via
- Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
- sets. The CUPS backend will implement the PWG command set on
- LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
- The OS abstraction layer will be a thin client library that
- implements the following functions:
-
- ieee1394_list
- ieee1394_open
- ieee1394_close
- ieee1394_read
- ieee1394_write
- ieee1394_error
-
- The "ieee1394_list" function will list all of the available
- printer devices on the bus. The device information will
- consist of the device URI (ieee1394:/something) used to
- access the device and the make and model information, if
- available, for the device ("EPSON Stylus Printer").
-
- The "ieee1394_open" and "ieee1394_close" functions will open
- and close a connection to the printer, respectively.
-
- The "ieee1394_read" and "ieee1394_write" functions will read
- and write data to and from the printer, respectively. The
- read function will be non-blocking, returning data only if
- there is data coming back from the printer.
-
- The "ieee1394_error" function will return a string
- describing the last error or NULL if no error occurred.
-
- The library will be responsible for creating any background
- threads that are needed to monitor the connection to the
- printer.
-
-
-CUPS BACKEND
-
- The CUPS backend will use the OS abstraction layer to list
- and access the Firewire printers. The "main" function will
- read and write printer data, while the "list_devices"
- function will be called as necessary to identify the
- available devices.
-
- The CUPS 1.1 backend will record any status information in
[...16978 lines suppressed...]
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
--- release-1.2.1/templates/de/set-printer-options-trailer.tmpl 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/set-printer-options-trailer.tmpl 2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1 @@
+</FORM>
--- release-1.2.1/templates/de/test-page.tmpl 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/test-page.tmpl 2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,2 @@
+<P>Testseite gesendet; Auftrags ID ist <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
--- release-1.2.1/templates/de/trailer.tmpl 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/trailer.tmpl 2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,21 @@
+</TD>
+<TD WIDTH="15"> </TD>
+</TR>
+<TR CLASS="trailer">
+<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
+
+<P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
+eingetragene Warenzeichen der <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS ist urheberrechtlich geschützt 1997-2006 von Easy Software Products,
+Alle Rechte vorbehalten.</SMALL></P>
+
+</TD>
+
+<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
--- release-1.2.1/templates/de/users.tmpl 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.2.x/templates/de/users.tmpl 2006-07-18 15:31:57.000000000 +0100
@@ -0,0 +1,26 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}
+
+<H2 CLASS="title">Berechtigte Benutzer für {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Benutzer:</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Erlaube diesen Benutzern zu drucken
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Verweigere diesen Benutzern zu drucken
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Erlaubte Benutzer festlegen">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>
--- release-1.2.1/templates/ja/printers.tmpl 2006-07-04 17:35:19.000000000 +0100
+++ cups-1.2.x/templates/ja/printers.tmpl 2006-07-14 11:41:16.000000000 +0100
@@ -12,7 +12,7 @@
<B>å ´æ‰€:</B> {printer_location}<BR>
<B>メーカã¨ãƒ¢ãƒ‡ãƒ«:</B> {printer_make_and_model}<BR>
<B>プリンタã®çŠ¶æ…‹:</B> {printer_state=3?å¾…æ©Ÿä¸:{printer_state=4?処ç†ä¸:åœæ¢}},
-{printer_is_accepting_jobs=0?ジョブを拒å¦ä¸:ジョブをå—ã‘付ã‘ä¸}, {printer_is_shared=0?not:} 公開。
+{printer_is_accepting_jobs=0?ジョブを拒å¦ä¸:ジョブをå—ã‘付ã‘ä¸}, {printer_is_shared=0?éž:}公開。
{?device_uri=?:<BR><B>デãƒã‚¤ã‚¹ URI:</B> {device_uri}}
<P>
--- release-1.2.1/templates/Makefile 2006-07-04 17:35:22.000000000 +0100
+++ cups-1.2.x/templates/Makefile 2006-06-26 12:45:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $"
+# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $"
#
# Template makefile for the Common UNIX Printing System (CUPS).
#
@@ -118,11 +118,13 @@
# Install files...
#
-install: all
+install: all $(INSTALL_LANGUAGES)
$(INSTALL_DIR) -m 755 $(DATADIR)/templates
for file in $(FILES); do \
$(INSTALL_DATA) $$file $(DATADIR)/templates; \
done
+
+install-languages:
for lang in $(LANGUAGES); do \
$(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
for file in $(FILES); do \
@@ -137,19 +139,21 @@
# Uninstall files...
#
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
for file in $(FILES); do \
$(RM) $(DATADIR)/templates/$$file; \
done
+ -$(RMDIR) $(DATADIR)/templates
+
+uninstall-languages:
for lang in $(LANGUAGES); do \
for file in $(FILES); do \
$(RM) $(DATADIR)/templates/$$lang/$$file; \
done \
$(RMDIR) $(DATADIR)/templates/$$lang; \
done
- -$(RMDIR) $(DATADIR)/templates
#
-# End of "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $".
+# End of "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $".
#
--- release-1.2.1/test/ipptest.c 2006-07-04 17:33:09.000000000 +0100
+++ cups-1.2.x/test/ipptest.c 2006-07-18 15:31:56.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $"
+ * "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $"
*
* IPP test command for the Common UNIX Printing System (CUPS).
*
@@ -122,6 +122,7 @@
int status; /* Status of tests... */
const char *uri; /* URI to use */
const char *testfile; /* Test file to use */
+ int interval; /* Test interval */
/*
@@ -133,6 +134,7 @@
uri = NULL;
testfile = NULL;
status = 0;
+ interval = 0;
for (i = 1; i < argc; i ++)
{
@@ -140,6 +142,15 @@
{
if (!strcmp(argv[i], "-v"))
Verbosity ++;
+ else if (!strcmp(argv[i], "-i"))
+ {
+ i++;
+
+ if (i >= argc)
+ usage(NULL);
+ else
+ interval = atoi(argv[i]);
+ }
else
usage(argv[i]);
}
@@ -174,6 +185,19 @@
usage(NULL);
/*
+ * Loop if the interval is set...
+ */
+
+ if (interval)
+ {
+ for (;;)
+ {
+ sleep(interval);
+ do_tests(uri, testfile);
+ }
+ }
+
+ /*
* Exit...
*/
@@ -890,12 +914,13 @@
fputs("Usage: ipptest [options] URL testfile [ ... testfileN ]\n", stderr);
fputs("Options:\n", stderr);
fputs("\n", stderr);
- fputs("-v Show all attributes in response, even on success.\n", stderr);
+ fputs("-i N Repeat the last test file once every N seconds.\n", stderr);
+ fputs("-v Show all attributes in response, even on success.\n", stderr);
exit(1);
}
/*
- * End of "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $".
+ * End of "$Id: ipptest.c 5741 2006-07-17 18:36:20Z mike $".
*/
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- cups.spec 19 Jul 2006 00:01:44 -0000 1.228
+++ cups.spec 19 Jul 2006 11:18:36 -0000 1.229
@@ -5,7 +5,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2.1
-Release: 20
+Release: 21
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,7 @@
Source11: cups.conf
Source12: cups.cron
Source13: pdftops.conf
-Patch0: cups-svn5737.patch
+Patch0: cups-svn5754.patch
Patch1: cups-1.1.15-initscript.patch
Patch2: cups-no-gzip-man.patch
Patch3: cups-1.1.16-system-auth.patch
@@ -114,7 +114,7 @@
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5737
+%patch0 -p1 -b .svn5754
%patch1 -p1 -b .noinit
%patch2 -p1 -b .no-gzip-man
%patch3 -p1 -b .system-auth
@@ -390,11 +390,14 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
-* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1.2.1-20
+* Wed Jul 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-21
+- Sync with svn5754. Fixes bug #198987, bug #195532, bug #130118.
+
+* Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 1:1.2.1-20
- Require a new version of D-Bus and rebuild
* Fri Jul 14 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-19
-- Sync with svn5737.
+- Sync with svn5737. Fixes bug #192015.
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.1-18.1
- rebuild
--- cups-svn5737.patch DELETED ---
More information about the fedora-cvs-commits
mailing list