rpms/cups/devel cups-svn.patch, 1.9, 1.10 cups.spec, 1.199, 1.200 cups-rpath.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon May 22 17:09:52 UTC 2006
- Previous message (by thread): rpms/postgresql/FC-4 pgtcl-quote.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 postgresql.init, 1.20, 1.21 postgresql.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/cups/FC-5 cups-svn.patch, 1.4, 1.5 cups.spec, 1.175, 1.176 cups-1.1.19-no_rpath.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13170
Modified Files:
cups-svn.patch cups.spec
Removed Files:
cups-rpath.patch
Log Message:
- Sync to svn5568. No longer need rpath patch.
cups-svn.patch:
0 files changed
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.9 -r 1.10 cups-svn.patch
Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cups-svn.patch 20 May 2006 16:35:11 -0000 1.9
+++ cups-svn.patch 22 May 2006 17:09:37 -0000 1.10
@@ -1,5 +1,5 @@
--- cups-config.in (revision 5500)
-+++ cups-config.in (revision 5555)
++++ cups-config.in (revision 5568)
@@ -33,0 +34 @@
+imagelibdir=@libdir@
@@ -47,3 +48,15 @@
@@ -33,30 +33,36 @@
- echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+ echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
--- ppd/zebracpl.ppd (revision 5500)
-+++ ppd/zebracpl.ppd (revision 5555)
++++ ppd/zebracpl.ppd (revision 5568)
@@ -163 +163 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
--- ppd/zebra.ppd (revision 5500)
-+++ ppd/zebra.ppd (revision 5555)
++++ ppd/zebra.ppd (revision 5568)
@@ -258 +258 @@
-*CloseUI: *zeMediaType
+*CloseUI: *MediaType
--- ppd/zebraep1.ppd (revision 5500)
-+++ ppd/zebraep1.ppd (revision 5555)
++++ ppd/zebraep1.ppd (revision 5568)
@@ -284 +284 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
--- ppd/zebraep2.ppd (revision 5500)
-+++ ppd/zebraep2.ppd (revision 5555)
++++ ppd/zebraep2.ppd (revision 5568)
@@ -250 +250 @@
-*CloseUI: *zeMediaType
+*CloseUI: *MediaType
@@ -292 +292 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
+--- Makedefs.in (revision 5500)
++++ Makedefs.in (revision 5568)
+@@ -151,0 +152 @@
++DSO32FLAGS = @DSO32FLAGS@
+@@ -158,0 +160 @@
++DSO64FLAGS = @DSO64FLAGS@
--- backend/usb-unix.c (revision 5500)
-+++ backend/usb-unix.c (revision 5555)
++++ backend/usb-unix.c (revision 5568)
@@ -62,0 +63 @@
+ int usebc; /* Use backchannel path? */
@@ -85,0 +87,8 @@
@@ -74,17 +80,17 @@
+ FD_SET(fd, &input);
+
--- backend/serial.c (revision 5500)
-+++ backend/serial.c (revision 5555)
++++ backend/serial.c (revision 5568)
@@ -313 +313 @@
- if (*options == '+')
+ if (*options == '+' || *options == '&')
--- backend/ipp.c (revision 5500)
-+++ backend/ipp.c (revision 5555)
++++ backend/ipp.c (revision 5568)
@@ -279 +279 @@
- if (*optptr == '+')
+ if (*optptr == '+' || *optptr == '&')
--- config-scripts/cups-ssl.m4 (revision 5500)
-+++ config-scripts/cups-ssl.m4 (revision 5555)
++++ config-scripts/cups-ssl.m4 (revision 5568)
@@ -58,12 +58,8 @@
- AC_CHECK_HEADER(gnutls/gnutls.h,
- dnl Save the current libraries so the crypto stuff isn't always
@@ -112,8 +118,110 @@
+ AC_MSG_RESULT([ Using SSLFLAGS="$SSLFLAGS"])
+fi
+
+--- config-scripts/cups-compiler.m4 (revision 5500)
++++ config-scripts/cups-compiler.m4 (revision 5568)
+@@ -141,2 +141,2 @@
+- LIB32CUPS="libcups.32.so.2"
+- LIB32CUPSIMAGE="libcupsimage.32.so.2"
++ LIB32CUPS="32bit/libcups.so.2"
++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+@@ -165,2 +165,2 @@
+- LIB64CUPS="libcups.64.so.2"
+- LIB64CUPSIMAGE="libcupsimage.64.so.2"
++ LIB64CUPS="64bit/libcups.so.2"
++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+@@ -191,2 +191,2 @@
+- LIB32CUPS="libcups.32.so.2"
+- LIB32CUPSIMAGE="libcupsimage.32.so.2"
++ LIB32CUPS="32bit/libcups.so.2"
++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+@@ -218,2 +218,2 @@
+- LIB64CUPS="libcups.64.so.2"
+- LIB64CUPSIMAGE="libcupsimage.64.so.2"
++ LIB64CUPS="64bit/libcups.so.2"
++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+@@ -247,2 +247,2 @@
+- LIB32CUPS="libcups.32.so.2"
+- LIB32CUPSIMAGE="libcupsimage.32.so.2"
++ LIB32CUPS="32bit/libcups.so.2"
++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+@@ -271,2 +271,2 @@
+- LIB64CUPS="libcups.64.so.2"
+- LIB64CUPSIMAGE="libcupsimage.64.so.2"
++ LIB64CUPS="64bit/libcups.so.2"
++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+@@ -313,2 +313,5 @@
+- if test "x$with_optim" = x; then
+- OPTIM="+DAportable $OPTIM"
++ if test -z "$with_archflags"; then
++ # Build portable binaries for all HP systems...
++ ARCHFLAGS="+DAportable"
++ else
++ ARCHFLAGS="$with_archflags"
+@@ -342,2 +345,2 @@
+- LIB32CUPS="libcups.32.so.2"
+- LIB32CUPSIMAGE="libcupsimage.32.so.2"
++ LIB32CUPS="32bit/libcups.so.2"
++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+@@ -366,2 +369,2 @@
+- LIB64CUPS="libcups.64.so.2"
+- LIB64CUPSIMAGE="libcupsimage.64.so.2"
++ LIB64CUPS="64bit/libcups.so.2"
++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+@@ -401,2 +404,2 @@
+- LIB32CUPS="libcups.32.so.2"
+- LIB32CUPSIMAGE="libcupsimage.32.so.2"
++ LIB32CUPS="32bit/libcups.so.2"
++ LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+@@ -411 +414,10 @@
+- CFLAGS="-xarch=generic64 $CFLAGS"
++ fi
++
++ if test -z "$with_archflags"; then
++ if test -z "$with_arch64flags"; then
++ ARCHFLAGS="-xarch=generic64"
++ else
++ ARCHFLAGS="$with_arch64flags"
++ fi
++ else
++ ARCHFLAGS="$with_archflags"
+@@ -418,2 +430,2 @@
+- LIB64CUPS="libcups.64.so.2"
+- LIB64CUPSIMAGE="libcupsimage.64.so.2"
++ LIB64CUPS="64bit/libcups.so.2"
++ LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+@@ -421,0 +434 @@
++ fi
+@@ -423,6 +436,12 @@
+- if test "x$with_optim" = x; then
+- # Suppress all of Sun's questionable
+- # warning messages, and default to
+- # 32-bit compiles of everything else...
+- OPTIM="-w $OPTIM"
+- CFLAGS="-xarch=generic $CFLAGS"
++ if test "x$with_optim" = x; then
++ # Suppress all of Sun's questionable
++ # warning messages, and default to
++ # 32-bit compiles of everything else...
++ OPTIM="-w $OPTIM"
++ fi
++
++ if test -z "$with_archflags"; then
++ if test -z "$with_arch32flags"; then
++ ARCHFLAGS="-xarch=generic"
++ else
++ ARCHFLAGS="$with_arch32flags"
+@@ -431,7 +450 @@
+- if test "x$with_optim" = x; then
+- # Suppress all of Sun's questionable
+- # warning messages, and default to
+- # 32-bit compiles of everything else...
+- OPTIM="-w $OPTIM"
+- CFLAGS="-xarch=generic $CFLAGS"
+- fi
++ ARCHFLAGS="$with_archflags"
--- config-scripts/cups-directories.m4 (revision 5500)
-+++ config-scripts/cups-directories.m4 (revision 5555)
++++ config-scripts/cups-directories.m4 (revision 5568)
@@ -133,3 +133,5 @@
- AC_CHECK_PROG(INITDDIR, launchd,
- "/System/Library/LaunchDaemons",
@@ -123,9 +231,408 @@
+ else
+ INITDDIR="/System/Library/StartupItems/PrintingServices"
+ fi
+--- config-scripts/cups-ldap.m4 (revision 5500)
++++ config-scripts/cups-ldap.m4 (revision 5568)
+@@ -39 +39 @@
+- AC_CHECK_LIB(ldap, ldap_value_free,
++ AC_CHECK_LIB(ldap, ldap_initialize,
+--- config-scripts/cups-sharedlibs.m4 (revision 5500)
[...1843 lines suppressed...]
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasÄ™"></TD>
--- templates/pl/choose-make.tmpl (revision 5500)
-+++ templates/pl/choose-make.tmpl (revision 5555)
++++ templates/pl/choose-make.tmpl (revision 5568)
@@ -12 +12 @@
-<H2 CLASS="title">Producent urzÄ…dzenia {printer_name}</H2>
+<H2 CLASS="title">Producent {printer_name}</H2>
@@ -6537,18 +7303,18 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj DrukarkÄ™:Modyfikuj DrukarkÄ™}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkÄ™:Zmodyfikuj drukarkÄ™}"></TD>
--- templates/pl/job-cancel.tmpl (revision 5500)
-+++ templates/pl/job-cancel.tmpl (revision 5555)
++++ templates/pl/job-cancel.tmpl (revision 5568)
@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został anulowany.
+<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało anulowane.
--- templates/pl/printer-modified.tmpl (revision 5500)
-+++ templates/pl/printer-modified.tmpl (revision 5555)
++++ templates/pl/printer-modified.tmpl (revision 5568)
@@ -1 +1,2 @@
-<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
+<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została
+pomyślnie zmodyfikowana.
--- templates/pl/users.tmpl (revision 5500)
-+++ templates/pl/users.tmpl (revision 5555)
++++ templates/pl/users.tmpl (revision 5568)
@@ -6 +6 @@
-<H2 CLASS="title">Użytkownicy Uprawnieni do {printer_name}</H2>
+<H2 CLASS="title">Zezwoleni użytkownicy dla {printer_name}</H2>
@@ -6561,7 +7327,7 @@
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ustaw Uprawnienia Użytkowników">
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ustaw zezwolonych użytkowników">
--- templates/pl/trailer.tmpl (revision 5500)
-+++ templates/pl/trailer.tmpl (revision 5555)
++++ templates/pl/trailer.tmpl (revision 5568)
@@ -9,4 +9,4 @@
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
@@ -6572,7 +7338,7 @@
+Products</A>. Copyright 1997-2006 Easy Software Products,
+wszelkie prawa zastrzeżone.</SMALL></P>
--- templates/pl/printer-purge.tmpl (revision 5500)
-+++ templates/pl/printer-purge.tmpl (revision 5555)
++++ templates/pl/printer-purge.tmpl (revision 5568)
@@ -1,3 +1,3 @@
-<P>Wszystkie wydruki z {is_class?Grupy:Drukarki} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
@@ -6581,26 +7347,36 @@
+HREF="/{is_class?klasy:drukarki/{printer_name}">{printer_name}</A>
+została wyczyszczone ze wszystkich zadań.</P>
--- templates/es/jobs.tmpl (revision 5500)
-+++ templates/es/jobs.tmpl (revision 5555)
++++ templates/es/jobs.tmpl (revision 5568)
@@ -21 +21 @@
-{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado el<BR>{time_at_completed}:
+{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado:
--- cgi-bin/html.c (revision 5500)
-+++ cgi-bin/html.c (revision 5555)
++++ cgi-bin/html.c (revision 5568)
@@ -178 +178,2 @@
- fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n", prompt);
+ fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n",
+ prompt ? prompt : "(null)");
--- cgi-bin/printers.c (revision 5500)
-+++ cgi-bin/printers.c (revision 5555)
-@@ -334 +334 @@
++++ cgi-bin/printers.c (revision 5568)
+@@ -101,2 +101 @@
+- if ((user = getenv("REMOTE_USER")) == NULL)
+- user = "guest";
++ user = getenv("REMOTE_USER");
+@@ -334 +333 @@
- http, user);
+ http, user ? user : "(null)");
+@@ -360,2 +359,3 @@
+- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+- "requesting-user-name", NULL, user);
++ if (user)
++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
++ "requesting-user-name", NULL, user);
@@ -546 +546 @@
- http, printer);
+ http, printer ? printer : "(null)");
--- cgi-bin/template.c (revision 5500)
-+++ cgi-bin/template.c (revision 5555)
++++ cgi-bin/template.c (revision 5568)
@@ -63 +63 @@
- tmpl);
+ tmpl ? tmpl : "(null)");
@@ -6612,7 +7388,7 @@
+ fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n",
+ tmpl ? tmpl : "(null)");
--- cgi-bin/ipp-var.c (revision 5500)
-+++ cgi-bin/ipp-var.c (revision 5555)
++++ cgi-bin/ipp-var.c (revision 5568)
@@ -777 +777 @@
- obj, prefix, element);
+ obj, prefix ? prefix : "(null)", element);
@@ -6622,13 +7398,13 @@
+ filter_value ? filter_value : "(null)",
+ prefix ? prefix : "(null)", parent_el);
--- cgi-bin/help.c (revision 5500)
-+++ cgi-bin/help.c (revision 5555)
++++ cgi-bin/help.c (revision 5568)
@@ -190 +190,2 @@
- fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n", query, topic);
+ fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
+ query ? query : "(null)", topic ? topic : "(null)");
--- cgi-bin/admin.c (revision 5500)
-+++ cgi-bin/admin.c (revision 5555)
++++ cgi-bin/admin.c (revision 5568)
@@ -96 +96,2 @@
- fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n", cupsServer());
+ fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n",
@@ -6644,13 +7420,37 @@
+ !strcmp(keyword, "PaperDimension") ||
+ !strcmp(keyword, "ImageableArea"))
--- cgi-bin/var.c (revision 5500)
-+++ cgi-bin/var.c (revision 5555)
++++ cgi-bin/var.c (revision 5568)
@@ -952 +952,2 @@
- fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n", prompt);
+ fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n",
+ prompt ? prompt : "(null)");
+--- cgi-bin/classes.c (revision 5500)
++++ cgi-bin/classes.c (revision 5568)
+@@ -98,2 +98 @@
+- if ((user = getenv("REMOTE_USER")) == NULL)
+- user = "guest";
++ user = getenv("REMOTE_USER");
+@@ -190 +189 @@
+- const char *user) /* I - Username */
++ const char *user) /* I - Username */
+@@ -224,2 +223,3 @@
+- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+- "requesting-user-name", NULL, user);
++ if (user)
++ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
++ "requesting-user-name", NULL, user);
+--- scheduler/client.c (revision 5500)
++++ scheduler/client.c (revision 5568)
+@@ -1379 +1379,2 @@
+- con->http.fd, con->command, con->options);
++ con->http.fd, con->command,
++ con->options ? con->options : "(null)");
+@@ -3510 +3511 @@
+- command, options);
++ command, options ? options : "(null)");
--- scheduler/testmime.c (revision 5500)
-+++ scheduler/testmime.c (revision 5555)
++++ scheduler/testmime.c (revision 5568)
@@ -100,0 +101,2 @@
+ else if ((src = mimeType(mime, "application", "octet-stream")) != NULL)
+ printf("%s: application/octet-stream\n", argv[i]);
@@ -6663,7 +7463,7 @@
+ continue;
+
--- scheduler/ipp.c (revision 5500)
-+++ scheduler/ipp.c (revision 5555)
++++ scheduler/ipp.c (revision 5568)
@@ -629,0 +630,9 @@
+#ifdef CUPSD_USE_CHUNKING
+ /*
@@ -6697,7 +7497,7 @@
- !strcmp(attr->name, "notify-notify-events-default"))
+ !strcmp(attr->name, "notify-events-default"))
--- scheduler/dirsvc.c (revision 5500)
-+++ scheduler/dirsvc.c (revision 5555)
++++ scheduler/dirsvc.c (revision 5568)
@@ -668 +668 @@
- if (BrowseLocalProtocols & BROWSE_CUPS)
+ if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
@@ -6711,12 +7511,16 @@
-#ifdef HAVE_OPENDAP
+#ifdef HAVE_OPENLDAP
--- scheduler/auth.c (revision 5500)
-+++ scheduler/auth.c (revision 5555)
++++ scheduler/auth.c (revision 5568)
@@ -122 +122 @@
-#if defined(__hpux) && defined(HAVE_LIBPAM)
+#if defined(__hpux) && HAVE_LIBPAM
+@@ -1500 +1500,2 @@
+- con->uri, con->best, con->best ? con->best->location : "");
++ con->uri, con->best, con->best ? con->best->location ?
++ con->best->location : "(null)" : "");
--- scheduler/printers.c (revision 5500)
-+++ scheduler/printers.c (revision 5555)
++++ scheduler/printers.c (revision 5568)
@@ -2927,4 +2926,0 @@
- if (!strcasecmp(type->super, "application") &&
- !strcasecmp(type->type, "octet-stream"))
@@ -6739,7 +7543,7 @@
-
+ ipp_attribute_t *attr; /* Attribute data */
--- scheduler/job.c (revision 5500)
-+++ scheduler/job.c (revision 5555)
++++ scheduler/job.c (revision 5568)
@@ -882 +882 @@
- if (job->state_value >= IPP_JOB_STOPPED)
+ if (job->state_value > IPP_JOB_STOPPED)
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- cups.spec 22 May 2006 14:07:25 -0000 1.199
+++ cups.spec 22 May 2006 17:09:38 -0000 1.200
@@ -28,7 +28,6 @@
Patch6: cups-includeifexists.patch
Patch7: cups-banners.patch
Patch12: cups-locale.patch
-Patch17: cups-rpath.patch
Patch18: cups-language.patch
Patch20: cups-direct-usb.patch
Patch22: cups-dest-cache-v2.patch
@@ -116,7 +115,6 @@
%patch6 -p1 -b .includeifexists
%patch7 -p1 -b .banners
%patch12 -p1 -b .locale
-%patch17 -p1 -b .rpath
%patch18 -p1 -b .language
%patch20 -p1 -b .direct-usb
%patch22 -p1 -b .dest-cache-v2
@@ -137,7 +135,7 @@
export CFLAGS="-DLDAP_DEPRECATED=1"
%configure --with-docdir=%{_docdir}/cups-%{version} \
--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
- --with-log-file-perm=0700 --enable-pie --disable-rpath
+ --with-log-file-perm=0700 --enable-pie
# If we got this far, all prerequisite libraries must be here.
make
@@ -380,6 +378,7 @@
%changelog
* Mon May 22 2006 Tim Waugh <twaugh at redhat.com>
+- Sync to svn5568. No longer need rpath patch.
- Added a 'conflicts:' for kdelibs to prevent bug #192548.
* Sat May 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-6
--- cups-rpath.patch DELETED ---
- Previous message (by thread): rpms/postgresql/FC-4 pgtcl-quote.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 postgresql.init, 1.20, 1.21 postgresql.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/cups/FC-5 cups-svn.patch, 1.4, 1.5 cups.spec, 1.175, 1.176 cups-1.1.19-no_rpath.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list