rpms/kdelibs/FC-5 kdelibs-3.5.4-kabc-make.patch, NONE, 1.1 kdelibs-3.5.4-kde#115891.patch, NONE, 1.1 kdelibs-3.5.4-kde#131979.patch, NONE, 1.1 kdelibs-3.5.4-kde#133401.patch, NONE, 1.1 kdelibs-3.5.4-kde#134118.patch, NONE, 1.1 kdelibs-3.5.4-khtml-rendering.patch, NONE, 1.1 kdelibs.spec, 1.145, 1.146 kdelibs-3.5.4-cups-kdeprintrc.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Sep 30 07:34:21 UTC 2006


Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kabc-make.patch kdelibs-3.5.4-kde#115891.patch 
	kdelibs-3.5.4-kde#131979.patch kdelibs-3.5.4-kde#133401.patch 
	kdelibs-3.5.4-kde#134118.patch 
	kdelibs-3.5.4-khtml-rendering.patch 
Removed Files:
	kdelibs-3.5.4-cups-kdeprintrc.patch 
Log Message:
 -  fix #115891/bz#208270, CUPS 1.2.x unix socket support
 -  fix #123915, Page format display is 'overlaid'
 -  fix #100188, Fix incorrect 'endl' usage
 -  fix khtml rendering issue
 -  fix #134118, silent startup notification never going away


kdelibs-3.5.4-kabc-make.patch:
 Makefile.am |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdelibs-3.5.4-kabc-make.patch ---
--- kdelibs-3.5.4/kabc/Makefile.am.orig	2006-09-29 12:07:44.000000000 +0200
+++ kdelibs-3.5.4/kabc/Makefile.am	2006-09-29 12:06:01.000000000 +0200
@@ -55,6 +55,7 @@
 kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 kab2kabc_LDADD = libkabc.la ../kab/libkab.la
 kab2kabc_SOURCES = kab2kabc.cpp
+kab2kabc_COMPILE_FIRST = addressee.h
 
 autostart_DATA = kab2kabc.desktop
 autostartdir = $(datadir)/autostart

kdelibs-3.5.4-kde#115891.patch:
 Makefile.am            |    2 -
 cupsdconf2/cups-util.c |   17 ++++++++++----
 cupsdconf2/cups-util.h |    2 -
 cupsdoprint.c          |    6 ++---
 cupsinfos.cpp          |    7 +++++
 cupsinfos.h            |    1 
 kmcupsmanager.cpp      |   58 ++++++++++++++++++++++++++++++++-----------------
 kmcupsmanager.h        |    7 ++++-
 kmcupsuimanager.cpp    |    2 -
 9 files changed, 70 insertions(+), 32 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#115891.patch ---
Index: kdeprint/cups/kmcupsmanager.h
===================================================================
--- kdeprint/cups/kmcupsmanager.h	(Revision 586781)
+++ kdeprint/cups/kmcupsmanager.h	(Revision 586782)
@@ -25,8 +25,11 @@
 class IppRequest;
 class KLibrary;
 class KExtendedSocket;
-class QSocket;
 
+namespace KNetwork {
+    class KStreamSocket;
+}
+
 class KMCupsManager : public KMManager
 {
 	friend class KMWIppPrinter;
@@ -95,7 +98,7 @@
 private:
 	KLibrary	*m_cupsdconf;
 	KMPrinter	*m_currentprinter;
-	QSocket *m_socket;
+        KNetwork::KStreamSocket   *m_socket;
 	bool m_hostSuccess;
 	bool m_lookupDone;
 };
Index: kdeprint/cups/kmcupsuimanager.cpp
===================================================================
--- kdeprint/cups/kmcupsuimanager.cpp	(Revision 586781)
+++ kdeprint/cups/kmcupsuimanager.cpp	(Revision 586782)
@@ -135,7 +135,7 @@
 	QString		uri;
 
 	req.setOperation(CUPS_GET_DEVICES);
-	uri = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
+	uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
 
 	if (req.doRequest("/"))
Index: kdeprint/cups/kmcupsmanager.cpp
===================================================================
--- kdeprint/cups/kmcupsmanager.cpp	(Revision 586781)
+++ kdeprint/cups/kmcupsmanager.cpp	(Revision 586782)
@@ -45,12 +45,14 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
+#include <ksocketbase.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
 #include <kaction.h>
 #include <kdialogbase.h>
 #include <kextendedsocket.h>
 #include <kprocess.h>
+#include <kbufferedsocket.h>
 #include <kfilterdev.h>
 #include <cups/cups.h>
 #include <cups/ppd.h>
@@ -88,7 +90,7 @@
 
 KMCupsManager::~KMCupsManager()
 {
-	//delete m_socket;
+	delete m_socket;
 }
 
 QString KMCupsManager::driverDbCreationProgram()
@@ -135,7 +137,8 @@
 	{
 		req.setOperation(CUPS_ADD_CLASS);
 		QStringList	members = p->members(), uris;
-		QString		s = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
+		QString		s;
+                s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
 		for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
 			uris.append(s+(*it));
 		req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
@@ -907,25 +910,23 @@
 
 QString KMCupsManager::stateInformation()
 {
-	return QString("%1: %2:%3")
+	return QString("%1: %2")
 		.arg(i18n("Server"))
-		.arg(CupsInfos::self()->host())
-		.arg(CupsInfos::self()->port());
+		.arg(CupsInfos::self()->hostaddr());
 }
 
 void KMCupsManager::checkUpdatePossibleInternal()
 {
 	kdDebug(500) << "Checking for update possible" << endl;
 	delete m_socket;
-	/*m_socket = new KExtendedSocket( CupsInfos::self()->host(), CupsInfos::self()->port() );
-	connect( m_socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) );
-	connect( m_socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) );
-	m_socket->setTimeout( 1 );*/
-	m_socket = new QSocket( this );
-	connect( m_socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) );
-	connect( m_socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) );
-	trials = 5;
-	QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
+        m_socket = new KNetwork::KBufferedSocket;
+	m_socket->setTimeout( 1 );
+	connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), 
+                SLOT( slotConnectionSuccess() ) );
+	connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
+
+        trials = 5;
+        QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
 }
 
 void KMCupsManager::slotConnectionSuccess()
@@ -959,7 +960,10 @@
 {
 	kdDebug(500) << "Starting async connect" << endl;
 	//m_socket->startAsyncConnect();
-	m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
+        if (CupsInfos::self()->host().startsWith("/"))
+            m_socket->connect( QString(), CupsInfos::self()->host());
+        else
+            m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
 }
 
 void KMCupsManager::slotConnectionFailed( int errcode )
@@ -975,9 +979,25 @@
 		return;
 	}
 
-	setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
-				"Error: %1." ).arg( errcode == QSocket::ErrConnectionRefused ? i18n( "connection refused" ) : i18n( "host not found" ) ) );
-	setUpdatePossible( false );
+    QString einfo;
+
+    switch (errcode) {
+    case KNetwork::KSocketBase::ConnectionRefused:
+    case KNetwork::KSocketBase::ConnectionTimedOut:
+        einfo = i18n("connection refused") + QString(" (%1)").arg(errcode);
+        break;
+    case KNetwork::KSocketBase::LookupFailure:
+        einfo = i18n("host not found") + QString(" (%1)").arg(errcode);
+        break;
+    case KNetwork::KSocketBase::WouldBlock:
+    default:
+        einfo = i18n("read failed (%1)").arg(errcode);
+        break;
+    }
+
+    setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
+                "Error: %2: %1." ).arg( einfo, CupsInfos::self()->host()));
+    setUpdatePossible( false );
 }
 
 void KMCupsManager::hostPingSlot() {
@@ -1014,7 +1034,7 @@
 	if (use && !p->uri().isEmpty())
 		uri = p->uri().prettyURL();
 	else
-		uri = QString("ipp://%1:%2/%4/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
+		uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
 	return uri;
 }
 
Index: kdeprint/cups/cupsdoprint.c
===================================================================
--- kdeprint/cups/cupsdoprint.c	(Revision 586780)
+++ kdeprint/cups/cupsdoprint.c	(Revision 586781)
@@ -41,7 +41,7 @@
 #endif
 
 /* utility functions */
-void error(const char* msg)
+static void error(const char* msg)
 {
 	fprintf(stderr, "%s\n", msg);
 #if USE_LOG
@@ -50,7 +50,7 @@
 	exit(-1);
 }
 
-void usage()
+static void usage()
 {
 	error("usage: cupsdoprint [-H host[:port]][-P dest][-J name][-o opt=value[,...]][-U login[:password]] files...");
 }
@@ -81,7 +81,7 @@
    return result;
 }
 
-const char* getPasswordCB(const char* prompt)
+static const char* getPasswordCB(const char* prompt)
 {
 	char buf[ 256 ] = {0}, *c;
 	char *_user = shell_quote( cupsUser() ), *_passwd = NULL;
Index: kdeprint/cups/cupsinfos.h
===================================================================
--- kdeprint/cups/cupsinfos.h	(Revision 586777)
+++ kdeprint/cups/cupsinfos.h	(Revision 586778)
@@ -32,6 +32,7 @@
 	~CupsInfos();
 
 	const QString& host() const;
+        QString  hostaddr() const;
 	int port() const;
 	const QString& login() const;
 	const QString& password() const;
Index: kdeprint/cups/cupsinfos.cpp
===================================================================
--- kdeprint/cups/cupsinfos.cpp	(Revision 586777)
+++ kdeprint/cups/cupsinfos.cpp	(Revision 586778)
@@ -69,6 +69,13 @@
 {
 }
 
+QString CupsInfos::hostaddr() const
+{
+    if (host_[0] != '/')
+        return host_ + ":" + QString::number(port_);
+    return host_;
+}
+
 void CupsInfos::setHost(const QString& s)
 {
 	host_ = s;
Index: kdeprint/cups/cupsdconf2/cups-util.c
===================================================================
--- kdeprint/cups/cupsdconf2/cups-util.c	(Revision 583629)
+++ kdeprint/cups/cupsdconf2/cups-util.c	(Revision 583630)
@@ -443,8 +443,7 @@
 	the struct has changed in newer versions - PiggZ (adam at piggz.co.uk)
   */
 #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
-	if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 &&
-      strcasecmp(http->hostname, "localhost") != 0)
+        if (!httpAddrLocalhost(http))
 #else
 	if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
       strcasecmp(http->hostname, "localhost") != 0)
Index: kdeprint/cups/cupsdconf2/cups-util.c
===================================================================
--- kdeprint/cups/cupsdconf2/cups-util.c	(Revision 586775)
+++ kdeprint/cups/cupsdconf2/cups-util.c	(Revision 586776)
@@ -14,7 +14,7 @@
 static int cups_local_auth(http_t *http);
 
 const char *				/* O - Filename for PPD file */
-cupsGetConf()
+cupsGetConf(void)
 {
   int		fd;			/* PPD file */
   int		bytes;			/* Number of bytes read */
@@ -142,7 +142,11 @@
 	*/
 
 	snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-	httpEncode64(encode, plain);
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+       httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+#else
+       httpEncode64(encode, plain);
+#endif
 	snprintf(authstring, sizeof(authstring), "Basic %s", encode);
       }
       else
@@ -364,7 +368,11 @@
 	*/
 
 	snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-	httpEncode64(encode, plain);
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+       httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+#else
+       httpEncode64(encode, plain);
+#endif
 	snprintf(authstring, sizeof(authstring), "Basic %s", encode);
       }
       else
Index: kdeprint/cups/cupsdconf2/cups-util.h
===================================================================
--- kdeprint/cups/cupsdconf2/cups-util.h	(Revision 586775)
+++ kdeprint/cups/cupsdconf2/cups-util.h	(Revision 586776)
@@ -20,7 +20,7 @@
 #ifndef CUPS_UTIL_H
 #define CUPS_UTIL_H
 
-const char* cupsGetConf();
+const char* cupsGetConf(void);
 int cupsPutConf(const char *filename);
 
 #endif
--- kdeprint/cups/Makefile.am.orig	2006-09-28 23:30:14.000000000 +0200
+++ kdeprint/cups/Makefile.am	2006-09-28 23:32:33.000000000 +0200
@@ -2,7 +2,7 @@
 
 SUBDIRS = cupsdconf2
 
-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
+INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
 
 kde_module_LTLIBRARIES = kdeprint_cups.la
 

kdelibs-3.5.4-kde#131979.patch:
 downloaddialog.cpp |    5 +++--
 downloaddialog.h   |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#131979.patch ---
Index: knewstuff/downloaddialog.h
===================================================================
--- knewstuff/downloaddialog.h	(Revision 585243)
+++ knewstuff/downloaddialog.h	(Revision 585244)
@@ -216,7 +216,7 @@
     void slotInstall();
     void slotDetails();
     void slotInstalled(KIO::Job *job);
-    void slotTab(int tab);
+    void slotTab();
     void slotSelected();
     void slotPage(QWidget *w);
     void slotFinish();
Index: knewstuff/downloaddialog.cpp
===================================================================
--- knewstuff/downloaddialog.cpp	(Revision 585243)
+++ knewstuff/downloaddialog.cpp	(Revision 585244)
@@ -255,7 +255,7 @@
   ctl->addTab(w_l, i18n("Latest"));
 
   m_curtab = 0;
-  connect(ctl, SIGNAL(tabSelected(int)), SLOT(slotTab(int)));
+  connect(ctl, SIGNAL(currentChanged(QWidget *)), SLOT(slotTab()));
 
   QHBoxLayout *box = new QHBoxLayout(frame);
   box->add(ctl);
@@ -601,8 +601,9 @@
   delete m_s;
 }
 
-void DownloadDialog::slotTab(int tab)
+void DownloadDialog::slotTab()
 {
+  int tab = static_cast<const QTabWidget *>(sender())->currentPageIndex();
   kdDebug() << "switch tab to: " << tab << endl;
 
   Entry *eold = getEntry();

kdelibs-3.5.4-kde#133401.patch:
 kkeydialog.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#133401.patch ---
Index: kdeui/kkeydialog.cpp
===================================================================
--- kdeui/kkeydialog.cpp	(Revision 580072)
+++ kdeui/kkeydialog.cpp	(Revision 580073)
@@ -888,8 +888,11 @@
         KStdAccel::ShortcutList std_list;
         KShortcut newCut = origCut;
         removeFromShortcut(newCut, cut);
-        std_list.setShortcut( std_list.index( name ), newCut);
-        std_list.save();
+        int index = std_list.index( name );
+        if ( index >= 0 ) {
+            std_list.setShortcut( index, newCut );
+            std_list.save();
+        }
     }
 }
 

kdelibs-3.5.4-kde#134118.patch:
 kstartupinfo.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#134118.patch ---
Index: kdecore/kstartupinfo.cpp
===================================================================
--- kdecore/kstartupinfo.cpp	(Revision 573913)
+++ kdecore/kstartupinfo.cpp	(Revision 573914)
@@ -84,7 +84,7 @@
     : public KStartupInfoData
     {
     public:
-        Data() {}; // just because it's in a QMap
+        Data() : KStartupInfoData(), age(0) {}; // just because it's in a QMap
         Data( const QString& txt_P )
             : KStartupInfoData( txt_P ), age( 0 ) {};
         unsigned int age;
@@ -262,7 +262,7 @@
 	    emit gotNewStartup( id_P, d->startups[ id_P ] );
 	    return;
 	    }
-        emit gotStartupChange( id_P, d->startups[ id_P ] );
+        emit gotStartupChange( id_P, d->silent_startups[ id_P ] );
         return;
         }
     if( d->uninited_startups.contains( id_P ))
@@ -858,7 +858,7 @@
             {
             const KStartupInfoId& key = it.key();
             ++it;
-            kdDebug( 172 ) << "entry timeout:" << key.id() << endl;
+            kdDebug( 172 ) << "startups entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
             }
         else
@@ -877,7 +877,7 @@
             {
             const KStartupInfoId& key = it.key();
             ++it;
-            kdDebug( 172 ) << "entry timeout:" << key.id() << endl;
+            kdDebug( 172 ) << "silent entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
             }
         else
@@ -896,7 +896,7 @@
             {
             const KStartupInfoId& key = it.key();
             ++it;
-            kdDebug( 172 ) << "entry timeout:" << key.id() << endl;
+            kdDebug( 172 ) << "uninited entry timeout:" << key.id() << endl;
             remove_startup_info_internal( key );
             }
         else

kdelibs-3.5.4-khtml-rendering.patch:
 render_text.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.4-khtml-rendering.patch ---
Index: khtml/rendering/render_text.cpp
===================================================================
--- khtml/rendering/render_text.cpp	(Revision 584176)
+++ khtml/rendering/render_text.cpp	(Revision 584177)
@@ -223,11 +223,10 @@
 	// ### should be at most retrieved once per render text
 	QColor bg = khtml::retrieveBackgroundColor(text);
 	// It may happen that the contrast is -- well -- virtually non existent.
-	// In this case, simply invert the colors
-	if (!khtml::hasSufficientContrast(hbg, bg)) {
-	    hc = QColor(0xff-hc.red(),0xff-hc.green(),0xff-hc.blue());
-	    hbg = QColor(0xff-hbg.red(),0xff-hbg.green(),0xff-hbg.blue());
-	}/*end if*/
+	// In this case, simply swap the colors, thus in compliance with
+	// NN4 (win32 only), IE, and Mozilla.
+	if (!khtml::hasSufficientContrast(hbg, bg))
+	    qSwap(hc, hbg);
     }
 
     p->setPen(hc);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdelibs.spec	14 Sep 2006 10:07:01 -0000	1.145
+++ kdelibs.spec	30 Sep 2006 07:34:19 -0000	1.146
@@ -18,7 +18,7 @@
 %define dnotify 1
 
 Version: 3.5.4
-Release: 0.3.fc5
+Release: 0.4.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -47,7 +47,7 @@
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
-Patch39: kdelibs-3.5.4-cups-kdeprintrc.patch
+Patch39: kdelibs-3.5.4-kabc-make.patch
 
 # upstream patches
 Patch100: kdelibs-3.5.4-kde#131933.patch
@@ -62,6 +62,13 @@
 Patch109: kdelibs-3.5.4-kde#133677.patch
 Patch110: kdelibs-3.5.4-kde#123941.patch
 Patch111: kdelibs-3.5.4-kde#132678.patch
+Patch112: kdelibs-3.5.4-khtml-rendering.patch
+Patch113: kdelibs-3.5.4-kde#134118.patch
+Patch114: kdelibs-3.5.4-kde#133401.patch
+Patch115: kdelibs-3.5.4-kde#131979.patch
+Patch116: kdelibs-3.5.4-kde#115891.patch
+Patch117: kdelibs-3.5.4-kde#123915.patch
+Patch118: kdelibs-3.5.4-kde#100188.patch
 
 Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: qt >= %{qt_epoch}:%{qt_version}
@@ -187,7 +194,7 @@
 %patch35 -p1 -b .inttype
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
-%patch39 -p1 -b .cups-kdeprintrc
+%patch39 -p1 -b .kabc-make
 
 # upstream pathces
 %patch100 -p0 -b .kde#131933
@@ -202,6 +209,13 @@
 %patch109 -p0 -b .kde#133677
 %patch110 -p0 -b .kde#123941
 %patch111 -p0 -b .kde#132678
+%patch112 -p0 -b .khtml-rendering
+%patch113 -p0 -b .kde#134118
+%patch114 -p0 -b .kde#133401
+%patch115 -p0 -b .kde#131979
+%patch116 -p0 -b .kde#115891
+%patch117 -p0 -b .kde#123915
+%patch118 -p0 -b .kde#100188
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -389,7 +403,8 @@
 %{_bindir}/preparetips
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %attr(4755,root,root) %{_bindir}/kgrantpty
-%{_libdir}/lib*.so*
+%{_libdir}/lib*.so.*
+%{_libdir}/libkdeinit_*
 %{_libdir}/lib*.la
 %{_libdir}/kde3
 %{_datadir}/applications
@@ -413,7 +428,9 @@
 %defattr(-,root,root)
 %{_bindir}/dcopidl*
 %{_includedir}/kde
+%{_libdir}/lib*.so
 %{_libdir}/lib*.a
+%exclude %{_libdir}/libkdeinit_*
 
 %files apidocs
 %defattr(-,root,root)
@@ -421,6 +438,14 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Sat Sep 30 2006 Than Ngo <than at redhat.com> 3.5.4-0.4.fc5
+- apply upstream patches
+   fix #115891/bz#208270, CUPS 1.2.x unix socket support
+   fix #123915, Page format display is 'overlaid'
+   fix #100188, Fix incorrect 'endl' usage
+   fix khtml rendering issue
+   fix #134118, silent startup notification never going away
+
 * Tue Sep 12 2006 Than Ngo <than at redhat.com> 3.5.4-0.3.fc5
 - fix #205767, konsole no longer register itself to utmp
 - apply upstream patches


--- kdelibs-3.5.4-cups-kdeprintrc.patch DELETED ---




More information about the fedora-cvs-commits mailing list