rpms/kdelibs/devel kdelibs-3.5.7-cups13.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 kdelibs.spec, 1.220, 1.221

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdelibs.spec 
Added Files:
	kdelibs-3.5.7-cups13.patch 
Log Message:
* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-11
- build fails against cups-1.3 (#248717)


kdelibs-3.5.7-cups13.patch:

--- NEW FILE kdelibs-3.5.7-cups13.patch ---
--- 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)
       * 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 ||
           digest_tries > 1 || !pwdstring[0])
       {
        /*
@@ -116,7 +116,7 @@ cupsGetConf(void)
 	*/
 
 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
-        	 cups_server->hostname);
+        	 cupsServer());
 
         if ((password = cupsGetPassword(prompt)) == NULL)
 	  break;
@@ -135,7 +135,7 @@ cupsGetConf(void)
       * 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)
       {
        /*
 	* Basic authentication...
@@ -334,7 +334,7 @@ cupsPutConf(const char *name)		/* I - Na
       * 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 ||
           digest_tries > 1 || !pwdstring[0])
       {
        /*
@@ -342,7 +342,7 @@ cupsPutConf(const char *name)		/* I - Na
 	*/
 
 	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
-        	 cups_server->hostname);
+        	 cupsServer());
 
         if ((password = cupsGetPassword(prompt)) == NULL)
 	  break;
@@ -361,7 +361,7 @@ cupsPutConf(const char *name)		/* I - Na
       * 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)
       {
        /*
 	* Basic authentication...


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Jun 2007 18:09:56 -0000	1.39
+++ .cvsignore	19 Jul 2007 11:54:32 -0000	1.40
@@ -1,16 +1,3 @@
-kdelibs-3.3.0.tar.bz2
-kdelibs-3.3.1.tar.bz2
-kdelibs-3.3.2.tar.bz2
-kdelibs-3.4.0-rc1.tar.bz2
-kdelibs-3.4.0.tar.bz2
-kdelibs-3.4.1.tar.bz2
-kdelibs-3.4.2.tar.bz2
-kdelibs-3.4.91.tar.bz2
-kdelibs-3.4.92.tar.bz2
-kdelibs-3.5.0.tar.bz2
-kdelibs-3.5.1.tar.bz2
-kdelibs-3.5.2.tar.bz2
-kdelibs-3.5.3.tar.bz2
-kdelibs-3.5.4.tar.bz2
+clog
 kdelibs-3.5.6.tar.bz2
 kdelibs-3.5.7.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kdelibs.spec	18 Jul 2007 12:45:05 -0000	1.220
+++ kdelibs.spec	19 Jul 2007 11:54:32 -0000	1.221
@@ -24,7 +24,7 @@
 Summary: K Desktop Environment - Libraries
 Epoch:   6
 Version: 3.5.7
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -51,6 +51,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch42: kdelibs-3.5.7-ICEauthority.patch
 Patch43: kdelibs-3.5.6-lang.patch
+Patch44: kdelibs-3.5.7-cups13.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch104: kdelibs-3.5.5-kstandarddirs.patch
@@ -207,6 +208,7 @@
 # omission recommended by upstream: http://bugs.kde.org/147454#c37
 #patch42 -p1 -b .ICEauthority
 %patch43 -p1 -b .lang
+%patch44 -p1 -b .cups13
 
 %patch104 -p1 -b .kstandarddirs
 
@@ -473,6 +475,9 @@
 
 
 %changelog
+* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-11
+- build fails against cups-1.3 (#248717)
+
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10
 - +Requires: kde-filesystem