rpms/kdelibs/devel kdelibs-3.5.7-cups13.patch, 1.1, 1.2 kdelibs.spec, 1.221, 1.222

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12225

Modified Files:
	kdelibs-3.5.7-cups13.patch kdelibs.spec 
Log Message:
try another cups13 patch...


kdelibs-3.5.7-cups13.patch:

Index: kdelibs-3.5.7-cups13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-3.5.7-cups13.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.7-cups13.patch	19 Jul 2007 11:54:32 -0000	1.1
+++ kdelibs-3.5.7-cups13.patch	19 Jul 2007 19:27:48 -0000	1.2
@@ -1,15 +1,16 @@
---- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2006-10-01 12:33:43.000000000 -0500
-+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-19 06:52:21.000000000 -0500
-@@ -108,7 +108,7 @@ cupsGetConf(void)
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2007-07-18 14:50:28.000000000 +0100
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-18 15:34:00.000000000 +0100
+@@ -108,7 +108,8 @@
        * See if we should retry the current digest password...
        */
  
 -      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), "Basic", 5) == 0 ||
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0 ||
            digest_tries > 1 || !pwdstring[0])
        {
         /*
-@@ -116,7 +116,7 @@ cupsGetConf(void)
+@@ -116,7 +117,7 @@
  	*/
  
  	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
@@ -18,25 +19,27 @@
  
          if ((password = cupsGetPassword(prompt)) == NULL)
  	  break;
-@@ -135,7 +135,7 @@ cupsGetConf(void)
+@@ -135,7 +136,8 @@
        * Got a password; encode it for the server...
        */
  
 -      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), "Basic", 5) == 0)
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0)
        {
         /*
  	* Basic authentication...
-@@ -334,7 +334,7 @@ cupsPutConf(const char *name)		/* I - Na
+@@ -334,7 +336,8 @@
        * See if we should retry the current digest password...
        */
  
 -      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), "Basic", 5) == 0 ||
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0 ||
            digest_tries > 1 || !pwdstring[0])
        {
         /*
-@@ -342,7 +342,7 @@ cupsPutConf(const char *name)		/* I - Na
+@@ -342,7 +345,7 @@
  	*/
  
  	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
@@ -45,12 +48,35 @@
  
          if ((password = cupsGetPassword(prompt)) == NULL)
  	  break;
-@@ -361,7 +361,7 @@ cupsPutConf(const char *name)		/* I - Na
+@@ -361,7 +364,8 @@
        * Got a password; encode it for the server...
        */
  
 -      if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-+      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE), "Basic", 5) == 0)
++      if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++		  "Basic", 5) == 0)
        {
         /*
  	* Basic authentication...
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-07-19 15:51:14.000000000 +0100
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:57:49.000000000 +0100
+@@ -309,7 +309,8 @@
+ 		return false;
+ 	}
+ 
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ 	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #endif
+ 
+@@ -319,7 +320,8 @@
+ 	}
+ 
+ 	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#ifdef HAVE_CUPS_NO_PWD_CACHE && \
++    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ 	cups_authstring = HTTP->authstring;
+ #endif
+ 	httpClose(HTTP);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- kdelibs.spec	19 Jul 2007 11:54:32 -0000	1.221
+++ kdelibs.spec	19 Jul 2007 19:27:48 -0000	1.222
@@ -24,7 +24,7 @@
 Summary: K Desktop Environment - Libraries
 Epoch:   6
 Version: 3.5.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -475,7 +475,7 @@
 
 
 %changelog
-* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-11
+* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-12
 - build fails against cups-1.3 (#248717)
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10