rpms/kdelibs/FC-5 kdelibs-3.5.2-cups-api.patch, NONE, 1.1 kdelibs-3.5.2-kdebug-kmail-quiet.patch, NONE, 1.1 kdelibs-3.5.2-kdeprint.patch, NONE, 1.1 kdelibs.spec, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv5511

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.2-cups-api.patch 
	kdelibs-3.5.2-kdebug-kmail-quiet.patch 
	kdelibs-3.5.2-kdeprint.patch 
Log Message:
- fix #173235, disable kmail debug info #173235
- don't use private API with newer CUPS >=1.1.20
- apply patch to fix crash in kdeprint



kdelibs-3.5.2-cups-api.patch:
 ipprequest.cpp |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE kdelibs-3.5.2-cups-api.patch ---
--- kdelibs-3.5.2/kdeprint/cups/ipprequest.cpp.orig	2006-05-08 15:50:20.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/ipprequest.cpp	2006-05-08 15:50:31.000000000 +0200
@@ -511,6 +511,11 @@
 	cupsFreeOptions(n, options);
 
 	// find an remove that annoying "document-format" attribute
+#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 19) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+    ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
+    ippDeleteAttribute(request_, attr);
+#else
+	// (can't use IppDeleteAttribute as older cups doesn't have that)
 	ipp_attribute_t	*attr = request_->attrs;
 	while (attr)
 	{
@@ -523,4 +528,5 @@
 		}
 		attr = attr->next;
 	}
+#endif
 }

kdelibs-3.5.2-kdebug-kmail-quiet.patch:
 kdebugrc |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.2-kdebug-kmail-quiet.patch ---
--- kdelibs-3.5.2/kdecore/kdebugrc.orig	2006-05-03 16:12:27.000000000 +0200
+++ kdelibs-3.5.2/kdecore/kdebugrc	2006-05-03 16:12:35.000000000 +0200
@@ -82,7 +82,7 @@
 
 # KMail
 [5006]
-InfoOutput=2
+InfoOutput=4
 
 # KitchenSync (Syncing Algorithm)
 [5250]

kdelibs-3.5.2-kdeprint.patch:
 kpgeneralpage.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.5.2-kdeprint.patch ---
--- kdelibs-3.5.2/kdeprint/kpgeneralpage.cpp.orig	2006-04-21 14:43:47.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/kpgeneralpage.cpp	2006-04-21 14:45:27.000000000 +0200
@@ -523,7 +523,7 @@
 			if (ch) setComboItem(m_papertype, ch->get("text"));
 		}
 		value = opts["InputSlot"];
-		if (m_inputslot->isEnabled() && !value.isEmpty())
+		if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty())
 		{
 			DrBase	*ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value);
 			if (ch) setComboItem(m_inputslot, ch->get("text"));


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kdelibs.spec	29 Mar 2006 19:48:25 -0000	1.128
+++ kdelibs.spec	9 May 2006 21:52:42 -0000	1.129
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 0.1.fc5
+Release: 0.2.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -52,6 +52,11 @@
 Patch34: kdelibs-3.4.0-qtdoc.patch
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch36: kdelibs-3.5.0-modular-x.patch
+Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
+
+# upstream patches
+Patch100: kdelibs-3.5.2-kdeprint.patch 
+Patch101: kdelibs-3.5.2-cups-api.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -181,7 +186,12 @@
 %patch34 -p1 -b .qtdoc
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .modular-x
+%patch37 -p1 -b .kdebug-kmail-quiet
 
+# upstream patches
+%patch100 -p1 -b .kdeprint
+%patch101 -p1 -b .cups-api
+ 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
    perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
@@ -385,6 +395,11 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue May 09 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc5 
+- fix #173235, disable kmail debug info #173235
+- don't use private API with newer CUPS >=1.2
+- apply patch to fix crash in kdeprint
+
 * Wed Mar 29 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5 
 - update to 3.5.2