dist-git conversion

- upstream patch to fix hang on login (for older kernels)

.cvsignore

@@ -1,4 +0,0 @@
-clog
-kdelibs-3.5.6.tar.bz2
-kdelibs-3.5.7.tar.bz2
-kdelibs-3.5.8.tar.bz2

.gitignore

@@ -0,0 +1 @@
+kdelibs-3.5.10.tar.bz2

Makefile

@@ -4,7 +4,7 @@ NAME := kdelibs
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -0,0 +1 @@
+F-8

kdelibs-3.5.10-proc.patch

@@ -0,0 +1,20 @@
+diff -up kdelibs-3.5.10/kinit/start_kdeinit.c.proc kdelibs-3.5.10/kinit/start_kdeinit.c
+--- kdelibs-3.5.10/kinit/start_kdeinit.c.proc	2008-08-19 13:18:12.000000000 -0500
++++ kdelibs-3.5.10/kinit/start_kdeinit.c	2008-11-20 15:54:54.000000000 -0600
+@@ -44,7 +44,7 @@ static int set_protection( pid_t pid, in
+ {
+    char buf[ 1024 ];
+    int procfile;
+-   sprintf( buf, "/proc/%d/oom_adj", pid );
++   sprintf( buf, "/proc/%d/stat", pid );
+    if( !enable ) {
+        /* Be paranoid and check that the pid we got from the pipe
+           belongs to this user. */
+@@ -52,6 +52,7 @@ static int set_protection( pid_t pid, in
+        if( lstat( buf, &st ) < 0 || st.st_uid != getuid())
+            return 0;
+    }
++   sprintf( buf, "/proc/%d/oom_adj", pid );
+    procfile = open( buf, O_WRONLY );
+    if( procfile >= 0 ) {
+       if( enable )

kdelibs-3.5.6-137675.patch

@@ -1,133 +0,0 @@
-Index: kioslave/metainfo/Makefile.am
-===================================================================
---- kioslave/metainfo/Makefile.am	(Revision 606834)
-+++ kioslave/metainfo/Makefile.am	(Arbeitskopie)
-@@ -2,7 +2,7 @@
- ## Makefile.am of kdebase/kioslave/metainfo
- 
- INCLUDES = $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
- 
- kde_module_LTLIBRARIES = kio_metainfo.la
-Index: kioslave/gzip/Makefile.am
-===================================================================
---- kioslave/gzip/Makefile.am	(Revision 606834)
-+++ kioslave/gzip/Makefile.am	(Arbeitskopie)
-@@ -1,5 +1,5 @@
- INCLUDES = -I$(top_srcdir)/kio $(all_includes)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- METASOURCES = AUTO
- 
- kde_module_LTLIBRARIES = kgzipfilter.la
-Index: kio/tests/Makefile.am
-===================================================================
---- kio/tests/Makefile.am	(Revision 606834)
-+++ kio/tests/Makefile.am	(Arbeitskopie)
-@@ -18,7 +18,7 @@
- 
- INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
- LDADD = $(LIB_KIO)
--AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
-                  kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
-Index: dcop/tests/Makefile.am
-===================================================================
---- dcop/tests/Makefile.am	(Revision 606834)
-+++ dcop/tests/Makefile.am	(Arbeitskopie)
-@@ -3,7 +3,6 @@
- 	@echo -e "dcop tests not run.\nRun make tests in the tests directory to make them"
- 
- INCLUDES = $(all_includes)
--AM_LDFLAGS   = $(all_libraries)
- 
- METASOURCES = AUTO
- 
-@@ -17,7 +16,7 @@
- 
- driver_SOURCES = driver.cpp test.stub
- driver_LDADD = $(LIB_KDECORE)
--driver_LDFLAGS = $(KDE_RPATH)
-+driver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- CLEANFILES = batch.generated definitions.generated driver.generated shell.generated
- 
-Index: dcop/dcopidl2cpp/Makefile.am
-===================================================================
---- dcop/dcopidl2cpp/Makefile.am	(Revision 606834)
-+++ dcop/dcopidl2cpp/Makefile.am	(Arbeitskopie)
-@@ -1,6 +1,5 @@
- 
- INCLUDES = $(all_includes)
--AM_LDFLAGS   = $(all_libraries)
- 
- ####### Files
- 
-@@ -10,7 +9,7 @@
- noinst_HEADERS = main.h
- 
- dcopidl2cpp_LDADD = $(LIB_QT)
--dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
-+dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
- 	../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
-Index: dcop/client/Makefile.am
-===================================================================
---- dcop/client/Makefile.am	(Revision 606834)
-+++ dcop/client/Makefile.am	(Arbeitskopie)
-@@ -1,6 +1,5 @@
- 
- INCLUDES = $(all_includes)
--AM_LDFLAGS   = $(all_libraries)
- DCOP_LIB = ../libDCOP.la
- 
- ####### Files
-@@ -9,19 +8,19 @@
- 
- dcop_SOURCES = dcop.cpp
- dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcop_LDFLAGS = $(KDE_RPATH)
-+dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- dcopstart_SOURCES = dcopstart.cpp
- dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopstart_LDFLAGS = $(KDE_RPATH)
-+dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- dcopquit_SOURCES = dcopquit.cpp
- dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopquit_LDFLAGS = $(KDE_RPATH)
-+dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- dcopfind_SOURCES = dcopfind.cpp
- dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
--dcopfind_LDFLAGS = $(KDE_RPATH)
-+dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- dcopclient_SOURCES = dcopclient.c
- dcopobject_SOURCES = dcopobject.c
-Index: dcop/dcopidl/Makefile.am
-===================================================================
---- dcop/dcopidl/Makefile.am	(Revision 606834)
-+++ dcop/dcopidl/Makefile.am	(Arbeitskopie)
-@@ -1,6 +1,5 @@
- 
- INCLUDES = $(all_includes)
--AM_LDFLAGS   = $(all_libraries)
- AM_CPPFLAGS = -DYYDEBUG
- 
- ####### Files
-@@ -11,7 +10,7 @@
- noinst_HEADERS = yacc.cc.h
- 
- dcopidl_LDADD = $(LIB_QT)
--dcopidl_LDFLAGS = $(KDE_RPATH)
-+dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- ####### Build rules
- 

kdelibs-3.5.7-openssl.patch

@@ -1,9 +1,12 @@
---- kdelibs-3.5.7/kio/kssl/kopenssl.cc.openssl	2006-07-22 03:16:39.000000000 -0500
+diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopenssl.cc
-+++ kdelibs-3.5.7/kio/kssl/kopenssl.cc	2007-06-20 08:58:25.000000000 -0500
+--- kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl	2006-07-22 03:16:39.000000000 -0500
-@@ -329,6 +329,15 @@ KConfig *cfg;
++++ kdelibs-3.5.8/kio/kssl/kopenssl.cc	2007-12-04 08:13:44.000000000 -0600
+@@ -329,6 +329,17 @@ KConfig *cfg;
               #ifdef SHLIB_VERSION_NUMBER
               << "libssl.so." SHLIB_VERSION_NUMBER
               #endif
++             << "libssl.so.0.9.8g"
++             << "libssl.so.7"
 +             << "libssl.so.0.9.8b"
 +             << "libssl.so.0.9.8a"
 +             << "libssl.so.6"
@@ -16,10 +19,12 @@
               << "libssl.so"
  	     << "libssl.so.0"
               #endif
-@@ -346,6 +355,15 @@ KConfig *cfg;
+@@ -346,6 +357,17 @@ KConfig *cfg;
               #ifdef SHLIB_VERSION_NUMBER
               << "libcrypto.so." SHLIB_VERSION_NUMBER
               #endif
++             << "libcrypto.so.0.9.8g"
++             << "libcrypto.so.7"
 +             << "libcrypto.so.0.9.8b"
 +             << "libcrypto.so.0.9.8a"
 +             << "libcrypto.so.6"

kdelibs-3.5.8-http-regression.patch

@@ -1,41 +0,0 @@
-Index: kioslave/http/http.cc
-===================================================================
---- kioslave/http/http.cc	(Revision 717341)
-+++ kioslave/http/http.cc	(Revision 726097)
-@@ -3409,10 +3409,6 @@
- 
-   } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
- 
--  // Send the current response before processing starts or it
--  // might never get sent...
--  forwardHttpResponseHeader();
--
-   // Now process the HTTP/1.1 upgrade
-   QStringList::Iterator opt = upgradeOffers.begin();
-   for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
-     mimeType( m_strMimeType );
-   }
- 
-+  // Do not move send response header before any redirection as it seems
-+  // to screw up some sites. See BR# 150904.
-+  forwardHttpResponseHeader();
-+
-   if (m_request.method == HTTP_HEAD)
-      return true;
- 
-@@ -3830,10 +3830,10 @@
-         // Check...
-         createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
-         if (!m_request.fcache)
--	    {
--		m_request.bCachedWrite = false; // Error creating cache entry.
--		kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
--	    }
-+        {
-+          m_request.bCachedWrite = false; // Error creating cache entry.
-+          kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+        }
-         m_request.expireDate = expireDate;
-         m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
-      }

kdelibs-3.5.8-kspell-hunspell.patch

@@ -0,0 +1,303 @@
+diff -ur kdelibs-3.5.8/kdeui/ksconfig.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp
+--- kdelibs-3.5.8/kdeui/ksconfig.cpp	2007-10-08 11:52:12.000000000 +0200
++++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp	2007-12-22 01:45:47.000000000 +0100
+@@ -1,6 +1,7 @@
+ /* This file is part of the KDE libraries
+    Copyright (C) 1997 David Sweet <dsweet@kde.org>
+    Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
++   Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -149,6 +150,7 @@
+   clientcombo->insertItem( i18n("Aspell") );
+   clientcombo->insertItem( i18n("Hspell") );
+   clientcombo->insertItem( i18n("Zemberek") );
++  clientcombo->insertItem( i18n("Hunspell") );
+   connect( clientcombo, SIGNAL (activated(int)), this,
+ 	   SLOT (sChangeClient(int)) );
+   glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 );
+@@ -240,8 +242,10 @@
+       dictcombo->insertItem( i18n("Turkish") );
+       sChangeEncoding( KS_E_UTF8 );
+     }
+-    else
++    else if ( iclient == KS_CLIENT_ASPELL )
+       getAvailDictsAspell();
++    else
++      getAvailDictsHunspell();
+   }
+   emit configChanged();
+ }
+@@ -399,8 +403,10 @@
+     langfnames.append("");
+     dictcombo->insertItem( i18n("Turkish") );
+   }
+-  else
++  else if ( iclient == KS_CLIENT_ASPELL )
+     getAvailDictsAspell();
++  else
++    getAvailDictsHunspell();
+ 
+   // select the used dictionary in the list
+   int whichelement=-1;
+@@ -583,6 +589,62 @@
+   }
+ }
+ 
++void KSpellConfig::getAvailDictsHunspell () {
++
++  langfnames.clear();
++  dictcombo->clear();
++  langfnames.append(""); // Default
++  dictcombo->insertItem( i18n("Hunspell Default") );
++
++  // dictionary path
++  QFileInfo dir ("/usr/share/myspell");
++  if (!dir.exists() || !dir.isDir())
++    dir.setFile ("/usr/share/hunspell");
++  if (!dir.exists() || !dir.isDir()) return;
++
++  kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
++	       << dir.filePath() << " " << dir.dirPath() << endl;
++
++  const QDir thedir (dir.filePath(),"*.dic");
++  const QStringList entryList = thedir.entryList();
++
++  kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
++  kdDebug(750) << "entryList().count()="
++	       << entryList.count() << endl;
++
++  QStringList::const_iterator entryListItr = entryList.constBegin();
++  const QStringList::const_iterator entryListEnd = entryList.constEnd();
++
++  for ( ; entryListItr != entryListEnd; ++entryListItr)
++  {
++    QString fname, lname, hname;
++    fname = *entryListItr;
++
++    // remove .dic
++    if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
++
++    if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
++    { // This one is the KDE default language
++      // so place it first in the lists (overwrite "Default")
++
++      langfnames.remove ( langfnames.begin() );
++      langfnames.prepend ( fname );
++
++      hname=i18n("default spelling dictionary"
++                 ,"Default - %1 [%2]").arg(hname).arg(fname);
++
++      dictcombo->changeItem (hname,0);
++    }
++    else
++    {
++      langfnames.append (fname);
++      hname=hname+" ["+fname+"]";
++
++      dictcombo->insertItem (hname);
++    }
++  }
++}
++
+ void
+ KSpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
+ {
+@@ -661,8 +723,7 @@
+       box->insertItem( i18n("Turkish") );
+       langfnames.append("");
+       sChangeEncoding( KS_E_UTF8 );
+-    }
+-    else {
++    } else if ( iclient == KS_CLIENT_ASPELL ) {
+       box->clear();
+       langfnames.append(""); // Default
+       box->insertItem (i18n("ASpell Default"));
+@@ -741,6 +802,58 @@
+           }
+         }
+       }
++    } else {
++      box->clear();
++      langfnames.append(""); // Default
++      box->insertItem( i18n("Hunspell Default") );
++
++      // dictionary path
++      QFileInfo dir ("/usr/share/myspell");
++      if (!dir.exists() || !dir.isDir())
++        dir.setFile ("/usr/share/hunspell");
++      if (!dir.exists() || !dir.isDir()) return;
++
++      kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
++                   << dir.filePath() << " " << dir.dirPath() << endl;
++
++      const QDir thedir (dir.filePath(),"*.dic");
++      const QStringList entryList = thedir.entryList();
++
++      kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
++      kdDebug(750) << "entryList().count()="
++                   << entryList.count() << endl;
++
++      QStringList::const_iterator entryListItr = entryList.constBegin();
++      const QStringList::const_iterator entryListEnd = entryList.constEnd();
++
++      for ( ; entryListItr != entryListEnd; ++entryListItr)
++      {
++        QString fname, lname, hname;
++        fname = *entryListItr;
++
++        // remove .dic
++        if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
++
++        if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
++        { // This one is the KDE default language
++          // so place it first in the lists (overwrite "Default")
++
++          langfnames.remove ( langfnames.begin() );
++          langfnames.prepend ( fname );
++
++          hname=i18n("default spelling dictionary"
++                     ,"Default - %1 [%2]").arg(hname).arg(fname);
++
++          box->changeItem (hname,0);
++        }
++        else
++        {
++          langfnames.append (fname);
++          hname=hname+" ["+fname+"]";
++
++          box->insertItem (hname);
++        }
++      }
+     }
+     int whichelement = langfnames.findIndex(qsdict);
+     if ( whichelement >= 0 ) {
+diff -ur kdelibs-3.5.8/kdeui/ksconfig.h kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h
+--- kdelibs-3.5.8/kdeui/ksconfig.h	2005-10-10 17:06:38.000000000 +0200
++++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h	2007-12-22 01:35:25.000000000 +0100
+@@ -1,5 +1,6 @@
+ /* This file is part of the KDE libraries
+    Copyright (C) 1997 David Sweet <dsweet@kde.org>
++   Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -61,7 +62,8 @@
+   KS_CLIENT_ISPELL=0,
+   KS_CLIENT_ASPELL=1,
+   KS_CLIENT_HSPELL=2,
+-  KS_CLIENT_ZEMBEREK=3
++  KS_CLIENT_ZEMBEREK=3,
++  KS_CLIENT_HUNSPELL=4
+ };
+ 
+ /**
+@@ -283,6 +285,7 @@
+     KSpellConfigPrivate *d;
+     void getAvailDictsIspell();
+     void getAvailDictsAspell();
++    void getAvailDictsHunspell();
+ };
+ 
+ #endif // KDELIBS_KSCONFIG_H
+diff -ur kdelibs-3.5.8/kdeui/kspell.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp
+--- kdelibs-3.5.8/kdeui/kspell.cpp	2005-10-10 17:06:38.000000000 +0200
++++ kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp	2007-12-22 02:26:29.000000000 +0100
+@@ -2,6 +2,7 @@
+    Copyright (C) 1997 David Sweet <dsweet@kde.org>
+    Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
+    Copyright (C) 2003 Zack Rusin <zack@kde.org>
++   Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -181,9 +182,14 @@
+     *proc << "zpspell";
+     kdDebug(750) << "Using zemberek(zpspell)" << endl;
+     break;
++  case KS_CLIENT_HUNSPELL:
++    *proc << "hunspell";
++    kdDebug(750) << "Using hunspell" << endl;
++    break;
+   }
+ 
+-  if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL )
++  // Hunspell doesn't need all of these options, but it'll ignore those it doesn't understand.
++  if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
+   {
+     *proc << "-a" << "-S";
+ 
+@@ -201,8 +207,8 @@
+       *proc << "-t";
+       break;
+     case Nroff:
+-      //only ispell supports
+-      if ( ksconfig->client() == KS_CLIENT_ISPELL )
++      //only ispell and hunspell support
++      if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
+         *proc << "-n";
+       break;
+     case Text:
+@@ -239,7 +245,60 @@
+   // option, so kspell tries again without it.  That's why as 'ps -ax'
+   // shows "ispell -a -S ..." withou the "-Tlatin2" option.
+ 
+-    if ( trystart<1 ) {
++    if ( ksconfig->client() == KS_CLIENT_HUNSPELL && trystart<1 ) {
++      // Note: This sets I/O encoding. Hunspell correctly handles dictionary encoding != I/O encoding.
++      // It will be faster if the I/O encoding matches the dictionary encoding, but using UTF-8 is always safe.
++      switch ( ksconfig->encoding() )
++      {
++      case KS_E_LATIN1:
++	*proc << "-i" << "ISO-8859-1";
++	break;
++      case KS_E_LATIN2:
++	*proc << "-i" << "ISO-8859-2";
++	break;
++      case KS_E_LATIN3:
++	*proc << "-i" << "ISO-8859-3";
++        break;
++      case KS_E_LATIN4:
++	*proc << "-i" << "ISO-8859-4";
++        break;
++      case KS_E_LATIN5:
++	*proc << "-i" << "ISO-8859-5";
++        break;
++      case KS_E_LATIN7:
++	*proc << "-i" << "ISO-8859-7";
++        break;
++      case KS_E_LATIN8:
++	*proc << "-i" << "ISO-8859-8";
++        break;
++      case KS_E_LATIN9:
++	*proc << "-i" << "ISO-8859-9";
++        break;
++      case KS_E_LATIN13:
++	*proc << "-i" << "ISO-8859-13";
++        break;
++      case KS_E_LATIN15:
++	*proc << "-i" << "ISO-8859-15";
++        break;
++      case KS_E_UTF8:
++	*proc << "-i" << "UTF-8";
++        break;
++      case KS_E_KOI8R:
++	*proc << "-i" << "KOI8-R";
++        break;
++      case KS_E_KOI8U:
++	*proc << "-i" << "KOI8-U";
++        break;
++      case KS_E_CP1251:
++	*proc << "-i" << "CP1251";
++        break;
++      case KS_E_CP1255:
++	*proc << "-i" << "CP1255";
++        break;
++      default:
++        break;
++      }
++    } else if ( trystart<1 ) {
+       switch ( ksconfig->encoding() )
+       {
+       case KS_E_LATIN1:

kdelibs-3.5.8-kspell2-no-ispell.patch

@@ -0,0 +1,21 @@
+diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am
+--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am	2007-12-21 20:39:46.000000000 +0100
++++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am	2007-12-22 21:34:10.000000000 +0100
+@@ -6,4 +6,4 @@
+ LIBHSPELLPLUGIN = hspell
+ endif
+ 
+-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell 
++SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
+diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in
+--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in	2007-12-21 20:40:22.000000000 +0100
++++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in	2007-12-22 21:35:39.000000000 +0100
+@@ -377,7 +377,7 @@
+ xdg_menudir = @xdg_menudir@
+ @include_aspell_plugin_TRUE@LIBASPELLPLUGIN = aspell
+ @include_hspell_plugin_TRUE@LIBHSPELLPLUGIN = hspell
+-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell 
++SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive

kdelibs-3.5.9-KDE3.patch

@@ -0,0 +1,41 @@
+diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp
+--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3	2008-02-13 03:41:06.000000000 -0600
++++ kdelibs-3.5.9/kio/kio/kservice.cpp	2008-05-15 15:36:13.000000000 -0500
+@@ -701,7 +701,7 @@ bool KService::noDisplay() const {
+   {
+      QString aValue = it.data().toString();
+      QStringList aList = QStringList::split(';', aValue);
+-     if (!aList.contains("KDE"))
++     if (!(aList.contains("KDE") || aList.contains("KDE3")) )
+         return true;
+   }
+ 
+@@ -710,7 +710,7 @@ bool KService::noDisplay() const {
+   {
+      QString aValue = it.data().toString();
+      QStringList aList = QStringList::split(';', aValue);
+-     if (aList.contains("KDE"))
++     if (aList.contains("KDE") || aList.contains("KDE3"))
+         return true;
+   }
+   
+diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp
+--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3	2007-05-14 02:52:35.000000000 -0500
++++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp	2008-05-15 15:39:34.000000000 -0500
+@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr
+   QStringList tmpList;
+   if (config.hasKey("OnlyShowIn"))
+   {
+-     if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
++     QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';');
++     if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3")))
+         d->m_bNoDisplay = true;
+   }
+   if (config.hasKey("NotShowIn"))
+   {
+-     if (config.readListEntry("NotShowIn", ';').contains("KDE"))
++     QStringList notShowInList = config.readListEntry("NotShowIn", ';');
++     if (notShowInList.contains("KDE") || notShowInList.contains("KDE3"))
+         d->m_bNoDisplay = true;
+   }
+ 

kdelibs-3.5.9-cupsserverbin.patch

@@ -0,0 +1,18 @@
+diff -ur kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2005-10-10 17:06:30.000000000 +0200
++++ kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2008-02-26 15:03:47.000000000 +0100
+@@ -71,10 +71,10 @@
+ 	//fontpath_ << (datadir_+"/fonts");
+ 	requestdir_ = findDir(QStringList("/var/spool/cups")
+ 			<< "/var/cups");
+-	serverbin_ = findDir(QStringList("/usr/lib" KDELIBSUFF "/cups")
+-			<< "/usr/local/lib" KDELIBSUFF "/cups"
+-			<< "/opt/lib" KDELIBSUFF "/cups"
+-			<< "/opt/local/lib" KDELIBSUFF "/cups");
++	serverbin_ = findDir(QStringList("/usr/lib/cups")
++			<< "/usr/local/lib/cups"
++			<< "/opt/lib/cups"
++			<< "/opt/local/lib/cups");
+ 	serverfiles_ = findDir(QStringList("/etc/cups")
+ 			<< "/usr/local/etc/cups");
+ 	tmpfiles_ = requestdir_+"/tmp";

kdelibs-3.5.9-drkonqi-kde4.patch

@@ -0,0 +1,21 @@
+diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
+--- kdelibs-3.5.9/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
++++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp	2008-07-02 08:24:37.000000000 +0200
+@@ -158,7 +158,7 @@
+           int i = 0;
+ 
+           // argument 0 has to be drkonqi
+-          argv[i++] = "drkonqi";
++          argv[i++] = "/usr/libexec/kde4/drkonqi";
+ 
+ #if defined Q_WS_X11
+           // start up on the correct display
+@@ -325,7 +325,7 @@
+       _exit(253);
+     if(!geteuid() && setuid(getuid()) < 0)
+       _exit(253);
+-    execvp("drkonqi", const_cast< char** >( argv ));
++    execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
+     _exit(errno);
+   }
+   else

kdelibs-3.5.9-fix-flock-redefinition.patch

@@ -0,0 +1,15 @@
+diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
+--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
++++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:59:17.000000000 +0200
+@@ -71,7 +71,11 @@
+ #include <linux/types.h>
+ // Linux kernel headers are documented to not compile
+ #define _S390_BITOPS_H
++#define flock linux_flock
++#define flock64 linux_flock64
+ #include <linux/inotify.h>
++#undef flock
++#undef flock64
+ 
+ static inline int inotify_init (void)
+ {

kdelibs.spec

@@ -1,17 +1,27 @@
 # kdelibs3 review: http://bugzilla.redhat.com/248899
 
+%define _default_patch_fuzz 2
+
 %define distname "Fedora"
 
 %define kde_settings 1 
 
 %define arts 1
-%define arts_epoch 8
+%define arts_ev 8:1.5.9
-%define arts_version 1.5.7
 
-%define qt_epoch 1
+%if 0%{?fedora} > 8
-%define qt_version 3.3.8
+%define qt3 qt3
-%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
+%else
-%define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
+%define qt3_epoch 1:
+%define qt3 qt
+%endif
+%define qt3_version 3.3.8b
+%define qt3_ev %{?qt3_epoch}%{qt3_version} 
+# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
+#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
+%define qt3_ver %{qt3_version}
+# fix this?... -- Rex
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
 
 %define kde_major_version 3
 
@@ -19,18 +29,25 @@
 
 %define apidocs 1
 
-Summary: K Desktop Environment - Libraries
+# We always include this here now because kdeartwork 4 has moved on to
-Version: 3.5.8
+# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
-Release: 5%{?dist}
+# yet either). Maybe the conditional should be dropped entirely? -- Kevin
+%define include_crystalsvg 1
+
+Summary: K Desktop Environment 3 - Libraries
+Version: 3.5.10
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
+# define to enable kdeui symlink hack -- Rex
+#define kdeui_symlink 1
 %else
 Name: kdelibs
 Epoch: 6
-Obsoletes: kdelibs3 = %{version}-%{release}
+Obsoletes: kdelibs3 < %{version}-%{release}
 Provides: kdelibs3 = %{version}-%{release}
 %endif
 
@@ -61,27 +78,38 @@ Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch45: kdelibs-3.5.7-autostart.patch
 Patch46: kdelibs-3.5.8-kate-vhdl.patch
+Patch48: kdelibs-3.5.8-kspell-hunspell.patch
+Patch49: kdelibs-3.5.8-kspell2-enchant.patch
+Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
+Patch51: kdelibs-3.5.9-cupsserverbin.patch
+# initial support for (Only|Not)ShowIn=KDE3
+Patch52: kdelibs-3.5.9-KDE3.patch
+# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
+Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
+# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
-# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
+# fix for old kernels, prevents hang on login
-Patch102: kdelibs-3.5.6-137675.patch
+Patch102: kdelibs-3.5.10-proc.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 
 ## upstream patches
-Patch200: kdelibs-3.5.8-http-regression.patch
 
-
+#{?arts:Requires: arts >= %{arts_ev}}
-%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
+#Requires: %{qt3} >= %{qt3_ev}
-Requires: qt >= %{qt_epoch}:%{qt_ver}
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
 %endif
 Requires: kde-filesystem
+%if "%{name}" != "kdelibs"
+Requires: kdelibs-common
+%endif
 Requires: redhat-menus
 Requires: shadow-utils
 BuildRequires: sudo
@@ -89,7 +117,8 @@ Requires(hint): sudo
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define   libkdnssd libkdnssd
-Requires: %{libkdnssd}
+# omit for now, may contribute to http://bugzilla.redhat.com/441222 
+#Requires: %{libkdnssd}
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
@@ -99,11 +128,16 @@ Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+%if 0%{?kdeui_symlink}
+# for %_kde4_* macros
+BuildRequires: kde4-macros(api) 
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+%endif
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
-BuildRequires: qt-devel qt-devel-docs
+BuildRequires: %{qt3}-devel %{qt3}-devel-docs
-%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
+%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -125,7 +159,12 @@ BuildRequires: libart_lgpl-devel
 BuildRequires: bzip2-devel
 BuildRequires: libtiff-devel
 BuildRequires: libacl-devel libattr-devel
+%if 0%{?fedora} >= 9
+BuildRequires: enchant-devel
+Requires: hunspell
+%else
 BuildRequires: aspell-devel
+%endif
 BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: db4-devel
@@ -140,7 +179,7 @@ BuildRequires: utempter
 %endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
-BuildRequires: OpenEXR-devel >= 1.6.0
+BuildRequires: OpenEXR-devel
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
@@ -149,8 +188,17 @@ BuildRequires: automake libtool
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 %endif
 
+%if 0%{?include_crystalsvg}
+Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
+Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
+%else
+# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
+Requires: crystalsvg-icon-theme
+%endif
+
+
 %description
-Libraries for the K Desktop Environment:
+Libraries for the K Desktop Environment 3:
 KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
 kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
 kspell (spelling checker), jscript (javascript), kab (addressbook),
@@ -158,7 +206,7 @@ kimgio (image manipulation).
 
 %package devel
 Group: Development/Libraries
-Summary: Header files and documentation for compiling KDE applications.
+Summary: Header files and documentation for compiling KDE 3 applications.
 %if "%{name}" == "kdelibs"
 Obsoletes: kdelibs3-devel < %{version}-%{release}
 Provides:  kdelibs3-devel = %{version}-%{release}
@@ -167,31 +215,17 @@ Obsoletes: kdelibs-devel < 6:%{version}-%{release}
 Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: qt-devel
+Requires: %{qt3}-devel
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
-%if 0%{?fedora} > 7
-## those below can/should be omitted from future builds -- Rex
-%else
-Requires: bzip2-devel
-Requires: libacl-devel
-Requires: libart_lgpl-devel
-Requires: libidn-devel
-Requires: libxslt-devel
-Requires: libjpeg-devel
-Requires: libtiff-devel
-%{?_with_libutempter:Requires: libutempter-devel}
-Requires: pcre-devel
-Requires: zlib-devel
-%endif
 %description devel
 This package includes the header files you will need to compile
-applications for KDE.
+applications for KDE 3.
 
 %package apidocs
 Group: Development/Documentation
-Summary: KDE API documentation.
+Summary: KDE 3 API documentation.
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}
 %if "%{name}" == "kdelibs"
 Provides: kdelibs3-apidocs = %{version}-%{release}
@@ -201,7 +235,7 @@ Provides:  kdelibs-apidocs = 6:%{version}-%{release}
 %endif
 
 %description apidocs
-This package includes the KDE API documentation in HTML
+This package includes the KDE 3 API documentation in HTML
 format for easy browsing
 
 
@@ -225,13 +259,23 @@ format for easy browsing
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
+%if 0%{?fedora} >= 9
+%patch48 -p1 -b .kspell
+%patch49 -p1 -b .kspell2
+%patch50 -p1 -b .no-ispell
+%endif
+%patch51 -p1 -b .cupsserverbin
+%patch52 -p1 -b .KDE3
+%if "%{name}" != "kdelibs"
+%patch53 -p1 -b .drkonqi-kde4
+%endif
+%patch54 -p1 -b .flock-redefinition
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
-%patch102 -p0 -b .kde#137675
 
 # upstream patches
-%patch200 -p0 -b .http-regression
+%patch102 -p1 -b .proc
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -243,7 +287,7 @@ sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{versi
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export QTDOC=%{qtdocdir}
+export QTDOC=%{qt3_docdir}
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -268,7 +312,12 @@ fi
    --enable-sendfile \
    --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
    --with-alsa \
+%if 0%{?fedora} >= 9
+   --without-aspell \
+%else
    --with-aspell \
+%endif
+   --without-hspell \
    --disable-libfam \
    --enable-dnotify \
    --enable-inotify \
@@ -281,7 +330,7 @@ fi
 
 make %{?_smp_mflags}
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
   make %{?_smp_mflags} apidox
 %endif
 
@@ -294,7 +343,7 @@ make DESTDIR=%{buildroot} install
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
@@ -310,21 +359,16 @@ for i in *; do
 done
 popd
 
-%if "%{name}" == "kdelibs3"
+install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
-install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde3.sh
+install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
-install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde3.csh
-%else
-install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
-install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
-# menus
 
+%if "%{name}" == "kdelibs"
+# menus
 mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
 mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
 %endif
 
-echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
-
 # Use hicolor-icon-theme rpm/pkg instead (#178319)
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
 
@@ -362,28 +406,78 @@ rm -f %{buildroot}%{_libdir}/libkdnssd.la
 
 %if "%{name}" != "kdelibs"
 # remove conflicts with kdelibs-4
-pushd %{buildroot}%{_bindir}
+rm -f %{buildroot}%{_bindir}/checkXML
-rm -f cupsdconf cupsdoprint imagetops kaddprinterwizard kconf_update kcookiejar \
+rm -f %{buildroot}%{_bindir}/ksvgtopng
-      kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
+rm -f %{buildroot}%{_bindir}/kunittestmodrunner
-      klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ktradertest \
+rm -f %{buildroot}%{_datadir}/config/kdebug.areas
-      make_driver_db_cups make_driver_db_lpr meinproc preparetips \
+rm -f %{buildroot}%{_datadir}/config/kdebugrc
-      khotnewstuff kinstalltheme kcmshell kfile kioexec
+rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
-# devel stuff (skip for now)
+rm -f %{buildroot}%{_docdir}/HTML/en/common/1.png
-#rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
+rm -f %{buildroot}%{_docdir}/HTML/en/common/10.png
-popd
+rm -f %{buildroot}%{_docdir}/HTML/en/common/2.png
-rm -f  %{buildroot}%{_datadir}/config/* \
+rm -f %{buildroot}%{_docdir}/HTML/en/common/3.png
-       %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
+rm -f %{buildroot}%{_docdir}/HTML/en/common/4.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/5.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/6.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/7.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/8.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/9.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/artistic-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-left.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-middle.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bottom-right.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/bsd-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/doxygen.css
+rm -f %{buildroot}%{_docdir}/HTML/en/common/favicon.ico
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/fdl-notice.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/footer.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/gpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/header.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/kde-default.css
+rm -f %{buildroot}%{_docdir}/HTML/en/common/kde_logo_bg.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license
+rm -f %{buildroot}%{_docdir}/HTML/en/common/lgpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/mainfooter.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/mainheader.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/qpl-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-left.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-middle.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right-konqueror.png
+rm -f %{buildroot}%{_docdir}/HTML/en/common/top-right.jpg
+rm -f %{buildroot}%{_docdir}/HTML/en/common/x11-license.html
+rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
+rm -rf %{buildroot}%{_datadir}/locale/all_languages
+rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
+rm -rf %{buildroot}%{_datadir}/autostart/
+# don't show kresources
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 
-rm -rf %{buildroot}%{_datadir}/config/colors \
+%if 0%{?kdeui_symlink}
-       %{buildroot}%{_datadir}/apps/k* \
+# kdeui for kde3, kinda workaround http://bugs.kde.org/157850
-       %{buildroot}%{_datadir}/apps/LICENSES \
+# and save space by sharing
-       %{buildroot}%{_datadir}/apps/proxyscout \
+rm -rf %{buildroot}%{_datadir}/apps/kdeui/
-       %{buildroot}%{_datadir}/locale \
+ln -s  %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
-       %{buildroot}%{_datadir}/autostart \
-       %{buildroot}/etc/xdg \
-       %{buildroot}%{_docdir}/HTML \
-       %{buildroot}%{_datadir}/emoticons
 %endif
+%endif
+
+%if 0%{?include_crystalsvg} == 0
+# remove all crystalsvg icons for now
+rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
+%endif
+
+
+%check
+ERROR=0
+%if 0%{?apidocs}
+if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
+  echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
+  ERROR=1
+fi 
+%endif
+exit $ERROR
 
 
 %clean
@@ -392,14 +486,25 @@ rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
+%if 0%{?include_crystalsvg}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
+%endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
+%if 0%{?kdeui_symlink}
+rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
+
+%pre
+test -d %{_datadir}/apps/kdeui -a ! -L %{_datadir}/apps/kdeui && \
+  mv %{_datadir}/apps/kdeui %{_datadir}/apps/kdeui.rpm_remove ||:
+%endif
 
 %postun
 /sbin/ldconfig
+%if 0%{?include_crystalsvg}
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
+%endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 
@@ -448,6 +553,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/kioslave
 %{_bindir}/klauncher
 %{_bindir}/kmailservice
+%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %{_bindir}/ksendbugmail
 %{_bindir}/kshell
 %{_bindir}/kstartupconfig
@@ -472,30 +578,37 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %exclude %{_datadir}/apps/kdewidgets/
 %exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
 %config(noreplace) %{_datadir}/config/*
-%{_datadir}/icons/crystalsvg/
+%{_datadir}/emoticons/*
 %{_datadir}/icons/default.kde
 %{_datadir}/mimelnk/magic
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %ghost %{_datadir}/services/ksycoca
+%{_docdir}/HTML/en/kspell
 %if "%{name}" == "kdelibs"
 %{_sysconfdir}/xdg/menus/*.menu
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %{_datadir}/autostart/*
-%{_datadir}/emoticons/*
+# include also the conflicting file in kdelibs fedora < 9
-%{_datadir}/locale/all_languages
 %{_docdir}/HTML/en/common
-%{_docdir}/HTML/en/kspell
+%{_datadir}/locale/all_languages
+%else
+%{_docdir}/HTML/en/common/*
+%endif
+%if 0%{?include_crystalsvg}
+%{_datadir}/icons/crystalsvg/
 %endif
 
 %files devel
 %defattr(-,root,root,-)
+# include also the conflicting file in kdelibs-devel fedora < 9
+%if "%{name}" == "kdelibs"
 %{_bindir}/checkXML
-%{_bindir}/dcopidl*
-%{_bindir}/kconfig_compiler
 %{_bindir}/ksvgtopng
 %{_bindir}/kunittestmodrunner
+%endif
+%{_bindir}/dcopidl*
+%{_bindir}/kconfig_compiler
 %{_bindir}/makekdewidgets
 %{_datadir}/apps/kdewidgets/
 %dir %{_libdir}/kde3/plugins/designer
@@ -506,7 +619,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
@@ -515,6 +628,134 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-2
+- upstream patch to fix hang on login (for older kernels)
+
+* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1
+- kde-3.5.10
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18
+- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+
+* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17
+- fix logic error in OnlyShowIn=KDE3 patch
+
+* Wed Jul 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-16
+- f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243)
+
+* Wed Jun 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-15
+- set include_crystalsvg to 1 everywhere
+- use Epoch 1 for crystalsvg-icon-theme, add Obsoletes
+
+* Tue Jun 03 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-14
+- revert kdeui symlink hack (there be dragons) 
+- unbreak -apidocs, add %%check so this never ever happens again
+
+* Sat May 24 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-13
+- f9+: include kdeui symlink here + scriptlets to help rpm handle it
+
+* Fri May 23 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-12
+- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
+
+* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-11
+- (Only|Not)ShowIn=KDE3 patch (helps #446466)
+
+* Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-10
+- fix kresources.desktop: NoDisplay=true
+
+* Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8
+- omit Requires: kdndsd-avahi (#441222)
+
+* Wed Apr 02 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-7
+- more qt->qt3 fixes
+
+* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-6
+- s/qt-devel/qt3-devel/
+
+* Mon Mar 10 2008 Than Ngo <than@redhat.com> 3.5.9-5
+- apply upstream patch to fix regression in kate (bz#436384)
+
+* Tue Mar 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.9-4
+- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 (fixes apidocs)
+
+* Tue Feb 26 2008 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.9-3
+- #230979: Writes ServerBin into cupsd.conf
+- #416101: unable to print after configuring printing in KDE
+
+* Sat Feb 16 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.9-2
+- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
+
+* Thu Feb 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-1
+- kde-3.5.9
+
+* Mon Feb 11 2008 Than Ngo <than@redhat.com> 3.5.8-24
+- make kresources hidden on f9+
+
+* Sat Feb 09 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-23
+- rebuild for GCC 4.3
+
+* Sat Dec 22 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-22
+- BR enchant-devel instead of aspell-devel on F9+ (FeatureDictionary)
+- Requires: hunspell on F9+ (FeatureDictionary)
+- patch KSpell for hunspell support on F9+ (FeatureDictionary)
+- add and build enchant backend for KSpell2 (backported from Sonnet) on F9+
+  (FeatureDictionary)
+- don't build aspell and ispell backends for KSpell2 on F9+ (FeatureDictionary)
+
+* Fri Dec 21 2007 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.8-21
+- updated Flash patch
+
+* Mon Dec 17 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-20
+- Requires: kdelibs-common (F9+) (#417251)
+
+* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
+- flash fix (#410651, kde#132138, kde#146784)
+- simplify crystalsvg-icon-theme handling
+
+* Tue Dec 11 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-18
+- set include_crystalsvg to 0 on F9+ (it comes from kdeartwork now)
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-17
+- update openssl patch
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-16
+- install profile scripts as 644 instead of 755 (Ville Skyttä, #407521)
+- don't rename profile scripts to kde3.(c)sh (not worth the breakage)
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-15
+- separate include_crystalsvg conditional, set to 1 until we have kdeartwork 4
+- don't run icon %%post/%%postun snippets for crystalsvg if we don't ship it
+- add "3" in all summaries and descriptions
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-14
+- fix inverted logic for Requires: crystalsvg-icon-theme
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-13
+- don't hardcode %%fedora
+
+* Wed Nov 21 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-12
+- renew the list of file conflicts and removals
+
+* Tue Nov 20 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-11
+- preserve makekdewidgets and kconf_compiler for fedora > 9
+- add Requires: crystalsvg-icon-theme (for kdelibs3)
+
+* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-10
+- only include and provide crystalsvg-icon-theme for fedora < 9
+
+* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-9
+- add switch to force rpmbuild behavior for testing
+- prepare %%files for non-conflicting kdelibs3
+
+* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-8
+- Provides: crystalsvg-icon-theme
+
+* Thu Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-7
+- fix application of custom zoom patch (rh#335461)
+
+* Tue Oct 23 2007 Than Ngo <than@redhat.com> - 3.5.8-6
+- Resolves: rh#335461, kpdf and kview lost custom zoom
+
 * Thu Oct 18 2007 Than Ngo <than@redhat.com> - 3.5.8-5
 - bz273681, add vhdl syntax for kate, thanks to Chitlesh GOORAH
 

sources

@@ -1 +1 @@
-acaa37e79e840d10dca326277a20863c  kdelibs-3.5.8.tar.bz2
+43cd55ed15f63b5738d620ef9f9fd568  kdelibs-3.5.10.tar.bz2