rpms/kdesdk/devel kdesdk-3.96.2-fix-kompare.patch, NONE, 1.1 kdesdk.spec, 1.75, 1.76 kdesdk-3.5.4-multilib.patch, 1.1, NONE kdesdk-3.5.7-subversion.patch, 1.1, NONE

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Dec 6 03:48:46 UTC 2007


Author: kkofler

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

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.96.2-fix-kompare.patch 
Removed Files:
	kdesdk-3.5.4-multilib.patch kdesdk-3.5.7-subversion.patch 
Log Message:
* Thu Dec 06 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-2
- drop kbabel from description (not actually there)
- reenable kompare, fix its build and porting bugs (kde#153463)
- add missing BR subversion-devel, add files for kio_svn to list
- add missing BR binutils-devel (for libiberty), add files for kmtrace to list

* Fri Nov 30 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.2-1
- kde-3.96.2

kdesdk-3.96.2-fix-kompare.patch:

--- NEW FILE kdesdk-3.96.2-fix-kompare.patch ---
diff -Nur kdesdk-3.96.2-orig/CMakeLists.txt kdesdk-3.96.2-fix-kompare/CMakeLists.txt
--- kdesdk-3.96.2-orig/CMakeLists.txt	2007-11-27 18:20:14.000000000 +0100
+++ kdesdk-3.96.2-fix-kompare/CMakeLists.txt	2007-12-05 04:10:12.000000000 +0100
@@ -43,9 +43,9 @@
 macro_optional_add_subdirectory(strigi-analyzer)
 macro_optional_add_subdirectory(kioslave)
 macro_optional_add_subdirectory(kmtrace)
-#message(STATUS "remember to port kompare to editinterface")
-MESSAGE(STATUS "Kompare from the branches/work/kompare/3-way-kompare will replace this version, so do not spend too much time on getting this version to work as it will be replaced.")
-#add_subdirectory(kompare)
+if( UNIX )
+macro_optional_add_subdirectory(kompare)
+endif( UNIX )
 macro_optional_add_subdirectory(kprofilemethod)
 message(STATUS "remember to port kspy to Qt4's metaobjects")
 #add_subdirectory(kspy)
diff -Nur kdesdk-3.96.2-orig/kompare/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/CMakeLists.txt
--- kdesdk-3.96.2-orig/kompare/CMakeLists.txt	2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/CMakeLists.txt	2007-12-04 21:35:31.000000000 +0100
@@ -43,7 +43,7 @@
 
 kde4_add_executable(kompare ${kompare_SRCS})
 
-target_link_libraries(kompare  kompareinterface dialogpages ${KDE4_KTEXTEDITOR_LIBS} )
+target_link_libraries(kompare  kompareinterface dialogpages ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
 
 install(TARGETS kompare  DESTINATION ${BIN_INSTALL_DIR} )
 
diff -Nur kdesdk-3.96.2-orig/kompare/komparenavtreepart/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/CMakeLists.txt
--- kdesdk-3.96.2-orig/kompare/komparenavtreepart/CMakeLists.txt	2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/CMakeLists.txt	2007-12-04 21:36:02.000000000 +0100
@@ -11,7 +11,7 @@
 
 
 
-target_link_libraries(komparenavtreepart  ${KDE4_KPARTS_LIBS} diff2 )
+target_link_libraries(komparenavtreepart  ${KDE4_KPARTS_LIBS} diff2 ${KDE4_KDE3SUPPORT_LIBS} )
 
 install(TARGETS komparenavtreepart  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -Nur kdesdk-3.96.2-orig/kompare/komparenavtreepart/komparenavtreepart.cpp kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/komparenavtreepart.cpp
--- kdesdk-3.96.2-orig/kompare/komparenavtreepart/komparenavtreepart.cpp	2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/komparenavtreepart.cpp	2007-12-05 01:59:41.000000000 +0100
@@ -677,12 +677,12 @@
 	s_instance = 0L;
 }
 
-KParts::Part* KompareNavTreePartFactory::createPartObject( QWidget* parentWidget, const char* widgetName,
-                                                  QObject* /*parent*/, const char* /*name*/,
+KParts::Part* KompareNavTreePartFactory::createPartObject( QWidget* parentWidget,
+                                                  QObject* /*parent*/,
                                                   const char* /*classname*/, const QStringList & /*args*/ )
 {
 	// Create an instance of our Part
-	KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName );
+	KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, 0 );
 
 	KGlobal::locale()->insertCatalog("kompare");
 
@@ -701,20 +701,7 @@
 	return *s_instance;
 }
 
-extern "C"
-{
-	KDE_EXPORT void* init_libkomparenavtreepart()
-	{
-/* TODO:
-/home/kde4dev/kde/src/kdesdk/kompare/komparenavtreepart/komparenavtreepart.cpp:708: error: cannot allocate an object of type `KompareNavTreePartFactory'
-/home/kde4dev/kde/src/kdesdk/kompare/komparenavtreepart/komparenavtreepart.cpp:708: error:   because the following virtual functions are abstract:
-/home/kde4dev/kde/include/kparts/factory.h:118: error:  virtual KParts::Part* KParts::Factory::createPartObject(QWidget*, QObject*, const char*, const QStringList&)
-make[2]: *** [kompare/komparenavtreepart/CMakeFiles/komparenavtreepart.dir/komparenavtreepart.o] Error 1
-
-
-		return new KompareNavTreePartFactory;
-*/
-	}
-}
+K_EXPORT_COMPONENT_FACTORY( libkomparenavtreepart, KompareNavTreePartFactory )
+K_EXPORT_PLUGIN( KompareNavTreePartFactory )
 
 #include "komparenavtreepart.moc"
diff -Nur kdesdk-3.96.2-orig/kompare/komparenavtreepart/komparenavtreepart.h kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/komparenavtreepart.h
--- kdesdk-3.96.2-orig/kompare/komparenavtreepart/komparenavtreepart.h	2007-02-19 11:01:32.000000000 +0100
+++ kdesdk-3.96.2-fix-kompare/kompare/komparenavtreepart/komparenavtreepart.h	2007-12-05 01:50:39.000000000 +0100
@@ -181,8 +181,7 @@
 public:
 	KompareNavTreePartFactory();
 	virtual ~KompareNavTreePartFactory();
-	virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName,
-	                                        QObject *parent, const char *name,
+	virtual KParts::Part* createPartObject( QWidget *parentWidget, QObject *parent,
 	                                        const char *classname, const QStringList &args );
 	static const KComponentData &componentData();
 
diff -Nur kdesdk-3.96.2-orig/kompare/komparepart/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/komparepart/CMakeLists.txt
--- kdesdk-3.96.2-orig/kompare/komparepart/CMakeLists.txt	2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/CMakeLists.txt	2007-12-05 00:45:07.000000000 +0100
@@ -5,11 +5,13 @@
 ########### next target ###############
 
 set(komparepart_PART_SRCS 
+   kompare_qsplitter.cpp 
    kompare_part.cpp 
    kompareconnectwidget.cpp 
    komparesplitter.cpp 
    komparelistview.cpp 
    kompareprefdlg.cpp 
+   komparesaveoptionsbase.cpp 
    komparesaveoptionswidget.cpp )
 
 
@@ -19,7 +21,7 @@
 
 
 
-target_link_libraries(komparepart  ${KDE4_KPARTS_LIBS} dialogpages diff2 kompareinterface )
+target_link_libraries(komparepart  ${KDE4_KPARTS_LIBS} dialogpages diff2 kompareinterface ${KDE4_KDE3SUPPORT_LIBS} )
 
 install(TARGETS komparepart  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -Nur kdesdk-3.96.2-orig/kompare/komparepart/kompareconnectwidget.cpp kdesdk-3.96.2-fix-kompare/kompare/komparepart/kompareconnectwidget.cpp
--- kdesdk-3.96.2-orig/kompare/komparepart/kompareconnectwidget.cpp	2006-10-26 04:18:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/kompareconnectwidget.cpp	2007-12-05 02:48:41.000000000 +0100
@@ -20,10 +20,15 @@
  ***************************************************************************/
 
 #include <qapplication.h>
-#include <qpainter.h>
+#include <Q3Painter>
 #include <qpixmap.h>
 #include <qstyle.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPaintEvent>
+#include <Q3Frame>
+#include <QMouseEvent>
 
 #include <kdebug.h>
 
@@ -41,18 +46,19 @@
                                                       ViewSettings* settings,
                                                       KompareSplitter* parent,
                                                       const char* name ) :
-	QSplitterHandle(Horizontal, (QSplitter *)parent, name),
+	KompareQSplitterHandle(Qt::Horizontal, (KompareQSplitter *)parent),
 	m_wid ( left, right, settings, this, name ),
 	m_label ( "", this ),
 	m_layout ( this )
 {
+	setObjectName( name );
 	setSizePolicy ( QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored) );
 	m_wid.setSizePolicy ( QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored) );
 	m_label.setSizePolicy ( QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed) );
 	m_label.setMargin(3);
-	QFrame* bottomLine = new QFrame(this);
-	bottomLine->setFrameShape(QFrame::HLine);
-	bottomLine->setFrameShadow ( QFrame::Plain );
+	Q3Frame* bottomLine = new Q3Frame(this);
+	bottomLine->setFrameShape(Q3Frame::HLine);
+	bottomLine->setFrameShadow ( Q3Frame::Plain );
 	bottomLine->setSizePolicy ( QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed) );
 	bottomLine->setFixedHeight(1);
 	m_layout.setSpacing(0);
@@ -68,14 +74,15 @@
 
 QSize KompareConnectWidgetFrame::sizeHint() const
 {
-	return QSize(50, style().pixelMetric( QStyle::PM_ScrollBarExtent ) );
+	return QSize(50, style()->pixelMetric( QStyle::PM_ScrollBarExtent ) );
 }
 
 static int kMouseOffset;
 
 void KompareConnectWidgetFrame::mouseMoveEvent( QMouseEvent *e )
 {
-	if ( !(e->state()&LeftButton) )
+
+	if ( !(e->state()&Qt::LeftButton) )
 		return;
 
 	QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
@@ -86,14 +93,14 @@
 
 void KompareConnectWidgetFrame::mousePressEvent( QMouseEvent *e )
 {
-	if ( e->button() == LeftButton )
+	if ( e->button() == Qt::LeftButton )
 		kMouseOffset = s->pick( e->pos() );
-	QSplitterHandle::mousePressEvent(e);
+	KompareQSplitterHandle::mousePressEvent(e);
 }
 
 void KompareConnectWidgetFrame::mouseReleaseEvent( QMouseEvent *e )
 {
-	if ( !opaque() && e->button() == LeftButton ) {
+	if ( !opaque() && e->button() == Qt::LeftButton ) {
 		QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
[...4514 lines suppressed...]
+	m_nextFile = ac->addAction( "difference_nextfile", this, SLOT(slotNextModel()) );
+	m_nextFile->setIcon( KIcon("arrow-down-double") );
+	m_nextFile->setText( i18n("N&ext File") );
+	m_nextFile->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_PageDown) );
+	m_previousDifference = ac->addAction( "difference_previous", this, SLOT(slotPreviousDifference()) );
+	m_previousDifference->setIcon( KIcon("arrow-up") );
+	m_previousDifference->setText( i18n("&Previous Difference") );
+	m_previousDifference->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_Up) );
+	m_nextDifference = ac->addAction( "difference_next", this, SLOT(slotNextDifference()) );
+	m_nextDifference->setIcon( KIcon("arrow-down") );
+	m_nextDifference->setText( i18n("&Next Difference") );
+	m_nextDifference->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_Down) );
 	m_previousDifference->setEnabled( false );
 	m_nextDifference->setEnabled( false );
 
@@ -293,16 +304,16 @@
 	if( !model->isModified() )
 		return true;
 
-	KTempFile* temp = new KTempFile();
+	KTemporaryFile* temp = new KTemporaryFile();
 
 	if( temp->status() != 0 ) {
 		emit error( i18n( "Could not open a temporary file." ) );
-		temp->unlink();
+		temp->remove();
 		delete temp;
 		return false;
 	}
 
-	QTextStream* stream = temp->textStream();
+	QTextStream stream( temp );
 	QStringList list;
 
 	DiffHunkListConstIterator hunkIt = model->hunks()->begin();
@@ -343,12 +354,12 @@
 	// kDebug( 8101 ) << "Everything: " << endl << list.join( "\n" ) << endl;
 
 	if( list.count() > 0 )
-		*stream << list.join( "" );
+		stream << list.join( "" );
 
 	temp->close();
 	if( temp->status() != 0 ) {
 		emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>", temp->name() ) );
-		temp->unlink();
+		temp->remove();
 		delete temp;
 		return false;
 	}
@@ -388,7 +399,7 @@
 	else
 	{
 		//model->slotSetModified( false );
-		temp->unlink();
+		temp->remove();
 		delete temp;
 	}
 
@@ -571,12 +582,12 @@
 {
 	kDebug() << "KompareModelList::saveDiff: " << endl;
 
-	m_diffTemp = new KTempFile();
+	m_diffTemp = new KTemporaryFile();
 	m_diffURL = url;
 
 	if( m_diffTemp->status() != 0 ) {
 		emit error( i18n( "Could not open a temporary file." ) );
-		m_diffTemp->unlink();
+		m_diffTemp->remove();
 		delete m_diffTemp;
 		m_diffTemp = 0;
 		return false;
@@ -598,9 +609,9 @@
 
 	if( success )
 	{
-		QTextStream* stream = m_diffTemp->textStream();
+		QTextStream stream( m_diffTemp );
 
-		*stream << m_diffProcess->diffOutput();
+		stream << m_diffProcess->diffOutput();
 
 		m_diffTemp->close();
 
@@ -615,7 +626,7 @@
 	}
 
 	m_diffURL.truncate( 0 );
-	m_diffTemp->unlink();
+	m_diffTemp->remove();
 
 	delete m_diffTemp;
 	m_diffTemp = 0;
@@ -856,6 +867,7 @@
 int KompareModelList::parseDiffOutput( const QString& diff )
 {
 	kDebug(8101) << "KompareModelList::parseDiffOutput" << endl;
+	emit diffString( diff );
 
 	QStringList diffLines = split( diff );
 
@@ -949,10 +961,14 @@
 
 	int srcLineNo = 1, destLineNo = 1;
 
-	QStringList lines = split( fileContents );
+	QStringList list = split( fileContents );
+	QLinkedList<QString> lines;
+	foreach (QString str, list) {
+		lines.append(str);
+	}
 
-	QStringList::ConstIterator linesIt = lines.begin();
-	QStringList::ConstIterator lEnd    = lines.end();
+	QLinkedList<QString>::ConstIterator linesIt = lines.begin();
+	QLinkedList<QString>::ConstIterator lEnd    = lines.end();
 
 	DiffHunkList* hunks = model->hunks();
 	kDebug(8101) << "Hunks in hunklist: " << hunks->count() << endl;
diff -Nur kdesdk-3.96.2-orig/kompare/libdiff2/komparemodellist.h kdesdk-3.96.2-fix-kompare/kompare/libdiff2/komparemodellist.h
--- kdesdk-3.96.2-orig/kompare/libdiff2/komparemodellist.h	2006-10-26 04:18:10.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/komparemodellist.h	2007-12-05 03:37:27.000000000 +0100
@@ -30,7 +30,7 @@
 
 class KAction;
 class KDirWatch;
-class KTempFile;
+class KTemporaryFile;
 
 class DiffSettings;
 class KompareProcess;
@@ -122,6 +122,7 @@
 	void applyDifference( bool apply );
 	void applyAllDifferences( bool apply );
 	void applyDifference( const Diff2::Difference* diff, bool apply );
+	void diffString( const QString& );
 
 	// Emits true when m_noOfModified > 0, false when m_noOfModified == 0
 	void setModified( bool modified );
@@ -170,7 +171,7 @@
 	QStringList split( const QString& diff );
 
 private:
-	KTempFile*            m_diffTemp;
+	KTemporaryFile*       m_diffTemp;
 	QString               m_diffURL;
 
 	KompareProcess*       m_diffProcess;
diff -Nur kdesdk-3.96.2-orig/kompare/libdiff2/levenshteintable.cpp kdesdk-3.96.2-fix-kompare/kompare/libdiff2/levenshteintable.cpp
--- kdesdk-3.96.2-orig/kompare/libdiff2/levenshteintable.cpp	2006-10-26 04:18:10.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/levenshteintable.cpp	2007-12-05 08:01:20.000000000 +0100
@@ -141,11 +141,11 @@
 	// Optimization, calculate row wise instead of column wise, wont trash the cache so much with large strings
 	for ( j = 1; j < n; ++j )
 	{
-		dj = QString(dq[ j ]).toInt();
+		dj = dq[j].unicode();
 
 		for ( i = 1; i < m; ++i )
 		{
-			si = QString(sq[ i ]).toInt();
+			si = sq[i].unicode();
 			if ( si == dj )
 				cost = 0;
 			else
diff -Nur kdesdk-3.96.2-orig/kompare/libdiff2/parserbase.cpp kdesdk-3.96.2-fix-kompare/kompare/libdiff2/parserbase.cpp
--- kdesdk-3.96.2-orig/kompare/libdiff2/parserbase.cpp	2007-08-29 11:55:07.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/parserbase.cpp	2007-12-05 02:09:02.000000000 +0100
@@ -301,7 +301,7 @@
 {
 //	kDebug(8101) << "ParserBase::parseUnifiedHunkHeader()" << endl;
 
-	if ( m_unifiedHunkHeader.exactMatch( *m_diffIterator ) )
+	if ( m_diffIterator != m_diffLines.end() && m_unifiedHunkHeader.exactMatch( *m_diffIterator ) )
 	{
 		++m_diffIterator;
 		return true;
diff -Nur kdesdk-3.96.2-orig/kompare/main.cpp kdesdk-3.96.2-fix-kompare/kompare/main.cpp
--- kdesdk-3.96.2-orig/kompare/main.cpp	2007-08-29 11:55:07.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/main.cpp	2007-12-05 01:08:52.000000000 +0100
@@ -95,7 +95,7 @@
 				ks = new KompareShell();
 				ks->show();
 				kDebug( 8100 ) << "OpenDiff..." << endl;
-				if ( ( strlen( args->arg(0) ) == 1 ) && (  *(args->arg(0)) == '-' ) )
+				if ( args->arg(0) == QLatin1String("-") )
 					ks->openStdin();
 				else
 					ks->openDiff( args->url( 0 ) );
@@ -149,7 +149,7 @@
 			ks->show();
 
 			kDebug( 8100 ) << "Single file. so openDiff/openStdin is only possible..." << endl;
-			if ( ( strlen( args->arg(0) ) == 1 && *(args->arg(0)) == '-' ) )
+			if ( args->arg(0) == QLatin1String("-") )
 				ks->openStdin();
 			else
 				ks->openDiff( args->url( 0 ) );


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdesdk.spec	1 Nov 2007 16:06:14 -0000	1.75
+++ kdesdk.spec	6 Dec 2007 03:48:13 -0000	1.76
@@ -1,69 +1,54 @@
-
-%define _with_subversion --with-subversion --with-apr-config=apr-1-config --with-apu-config=apu-1-config
-
-%define make_cvs 1 
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
-%define libs 1
-%endif
-
-Name:    kdesdk
-Summary: The KDE Software Development Kit (SDK)
-Version: 3.5.8
-Release: 2%{?dist}
-
-License: GPLv2
-Group: User Interface/Desktops
-URL: http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-
-Patch1: kdesdk-3.5.7-subversion.patch
-Patch2: kdesdk-3.5.4-multilib.patch
-
-Provides: kdesdk3 = %{version}-%{release}
-
-%if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: kdelibs3-devel >= %{version}
-# for kbugbuster/libkcal
-BuildRequires: kdepim3-devel
-BuildRequires: db4-devel
-BuildRequires: desktop-file-utils
-# kbabel,  F-7+: flex >= 2.5.33-9
-BuildRequires: flex
-# umbrello
-BuildRequires: libxslt-devel libxml2-devel
-%if 0%{?fedora} > 5 || 0%{?rhel} > 4
-BuildRequires: binutils-devel
-%endif
-BuildRequires: perl
-%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
-
-# Obsoletes/Provides
-%define cervisia_ver 2.4.7
-Provides: cervisia = %{cervisia_ver}-%{release}
-
-%define umbrello_ver 1.5.7
-Obsoletes: umbrello < %{umbrello_ver}-%{release}
-Provides:  umbrello = %{umbrello_ver}-%{release}
-
+Name:           kdesdk
+Version:        3.96.2
+Release:        2%{?dist}
+Summary:        The KDE Software Development Kit (SDK)
+
+Group:          User Interface/Desktops
+# FIXME/TODO: Check license
+License:        GPLv2
+URL:            http://www.kde.org/
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0:         kdesdk-3.96.2-fix-kompare.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  kde-filesystem >= 4
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+BuildRequires:  kdelibs4-devel >= %{version}
+BuildRequires:  kdepimlibs-devel >= %{version}
+BuildRequires:  kdebase-workspace-devel >= %{version}
+BuildRequires:  cmake
+BuildRequires:  flex
+BuildRequires:  libXcomposite-devel
+BuildRequires:  libXdamage-devel
+BuildRequires:  libxkbfile-devel
+BuildRequires:  libXpm-devel
+BuildRequires:  libXv-devel
+BuildRequires:  libXxf86misc-devel
+BuildRequires:  libXScrnSaver-devel
+BuildRequires:  giflib-devel
+BuildRequires:  apr-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  openldap-devel
+BuildRequires:  pcre-devel
+BuildRequires:  libXtst-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  subversion-devel
+# for libiberty (used by kmtrace for cp_demangle)
+# IMPORTANT: check licensing from time to time, currently libiberty is still
+#            GPLv2+/LGPLv2+
+BuildRequires:  binutils-devel
+
+# FIXME/TODO: are there other explicit Requires?
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+Requires: kdelibs4 >= %{version}
+Requires: kdepimlibs >= %{version}
+Requires: kdebase-workspace >= %{version}
 
 %description
 A collection of applications and tools used by developers, including:
 * cervisia: a CVS frontend
-* kbabel: PO file management
 * kbugbuster: a tool to manage the KDE bug report system
 * kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
 * kompare: diff tool
@@ -71,467 +56,132 @@
 * umbrello: UML modeller and UML diagram tool
 
 %package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Provides: kdesdk3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-Requires: kdelibs3-devel
+Group:    Development/Libraries
+Summary:  Header files for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4-devel kdepimlibs-devel
 %description devel
-%{summary}.
-
-%if 0%{?libs}
-%package libs
-Summary: %{name} runtime libraries
-Group:   System Environment/Libraries
-Requires: kdelibs3 >= %{version}
-# helps multilib upgrades
-Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
-# include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description libs
-%{summary}.
-%endif
-
+Header files for developing applications using %{name}.
 
 %prep
 %setup -q
-
-%patch1 -p1 -b .subversion
-%patch2 -p1 -b .multilib
-
-%if %{make_cvs}
-   make -f admin/Makefile.common cvs
-%endif
-
+%patch0 -p1
 
 %build
-unset QTDIR && . /etc/profile.d/qt.sh
 
-%configure \
-  --includedir=%{_includedir}/kde \
-  --disable-rpath \
-  --enable-new-ldflags \
-  --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --enable-final \
-  %{?_with_subversion}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot} 
+rm -rf %{buildroot}
+mkdir %{buildroot}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=%{buildroot}
+# remove static libraries internal to Kompare
+rm -f %{buildroot}%{_kde4_libdir}/libdialogpages.a %{buildroot}%{_kde4_libdir}/libdiff2.a
 
-desktop-file-install --vendor "" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop \
-
-# make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   if [ -d $i -a -L $i/common ]; then
-      rm -f $i/common
-      ln -nfs ../common $i
-   fi
+# move devel symlinks
+mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
+pushd %{buildroot}%{_kde4_libdir}
+for i in lib*.so
+do
+  case "$i" in
+    libkdeinit4_*.so)
+      ;;
+    *)
+      linktarget=`readlink "$i"`
+      rm -f "$i"
+      ln -sf "../../$linktarget" "kde4/devel/$i"
+      ;;
+  esac
 done
 popd
 
-rm -f %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile \
-      %{buildroot}/%{_datadir}/apps/kapptemplate/admin/Makefile.in
-
 
 %clean
 rm -rf %{buildroot}
 
-
-# trick to replace a dir by a symlink -- Rex
-%pre
-if [ $1 -gt 0 -a ! -L  %{_docdir}/HTML/en/cervisia/common ]; then 
-  rm -rf %{_docdir}/HTML/en/cervisia/common ||:
-fi
-
 %post
-%{!?libs:/sbin/ldconfig}
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-%{!?libs:/sbin/ldconfig}
-for f in crystalsvg hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%if 0%{?libs}
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-%endif
-
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_docdir}/HTML/en/*
-%{_datadir}/apps/*
-%{_datadir}/mimelnk/application/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/applications/kde/*
-%{_datadir}/config.kcfg/*
-%{_libdir}/kde3/*
-%{_libdir}/libkdeinit_*.so
+%doc COPYING COPYING.LIB COPYING-DOCS README
+%{_kde4_bindir}/*
+%{_kde4_configdir}/*
+%{_kde4_appsdir}/cervisia/
+%{_kde4_appsdir}/cervisiapart/*
+%{_kde4_appsdir}/kabc/*
+%{_kde4_appsdir}/kapptemplate/
+%{_kde4_appsdir}/katepart/
+%{_kde4_appsdir}/kate/
+%{_kde4_appsdir}/kbugbuster/
+%{_kde4_appsdir}/kcachegrind/*
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kicker/menuext/katesessionmenu.desktop
+%{_kde4_appsdir}/kmtrace/
+%{_kde4_appsdir}/kompare/
+%{_kde4_appsdir}/kuiviewer/*
+%{_kde4_appsdir}/kuiviewerpart/*
+%{_kde4_appsdir}/umbrello/
+%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/dbus-1/interfaces/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_docdir}/HTML/en/cervisia/
+%{_kde4_docdir}/HTML/en/kapptemplate/
+%{_kde4_docdir}/HTML/en/kate-plugins/
+%{_kde4_docdir}/HTML/en/kate/
+%{_kde4_docdir}/HTML/en/kbugbuster/
+%{_kde4_docdir}/HTML/en/kcachegrind/
+%{_kde4_docdir}/HTML/en/kdesvn-build/
+%{_kde4_docdir}/HTML/en/umbrello/
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_mandir}/man1/*
-
-%if 0%{?libs}
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
+%{_kde4_libdir}/libkdeinit4*.so
+%{_kde4_libdir}/strigi/*
+%{_kde4_libdir}/*.so.*
+%{_kde4_libdir}/kde4/*
+%exclude %{_kde4_libdir}/kde4/devel/
+%{_datadir}/dbus-1/interfaces/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.so
-%{_libdir}/libktrace_s.a
-
+%{_kde4_includedir}/*
+%{_kde4_libdir}/kde4/devel/*
 
 %changelog
-* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-2
-- -libs: Obsoletes: %%name ... to help out multilib upgrades
-- -libs conditional (f8+)
-
-* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
-- kde-3.5.8
-- libs subpkg (more multilib friendly)
-
-* Wed Sep 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-10
-- update %%description to mention included apps
-- move manpages to main pkg.
-- Provides: cervisia umbrello
-- kbugbuster kuiviewer: drop --add-only-show-in KDE
-- kioslave/svn: --with-subversion, patch
-
-* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-9
-- License: GPLv2
-- (Build)Requires: kdelibs3(-devel) kdepim3-devel
-- Provides: kdesdk3(-devel)
-
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 3.5.7-8
-- Rebuild for selinux ppc32 issue.
-
-* Fri Jul 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-7
-- don't use %%pretrans (#249374)
-
-* Thu Jun 28 2007 Than Ngo <than at redhat.com> - 3.5.7-6
-- get rid of flex workaround, it's now fixed in new flex
-
-* Fri Jun 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-5
-- clean up /usr/share/doc/HTML/en/cervisia/common hackery (#246072)
-
-* Sun Jun 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-4
-- flex patch
-- BR: subversion-devel neon-devel
-- portability
-
-* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-2
-- BR: kdepim-devel
-
-* Thu Jun 14 2007 Than Ngo <than at redhat.com> -  3.5.7-1.fc7
-- 3.5.7
-
-* Mon Apr 30 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
-- shouldn't own /usr/share/doc/HTML/en/common
-
-* Thu Feb 08 2007 Than Ngo <than at redhat.com> 3.5.6-1.fc7
-- 3.5.6
-
-* Tue Sep 05 2006 Than Ngo <than at redhat.com> 3.5.4-2
-- fix #205217, multilib issue
-- apply upstream patches
-    fix #131717, kompare won't parse diffs from git
-
-* Thu Aug 10 2006 Than Ngo <than at redhat.com> 3.5.4-1
-- rebuild
-
-* Mon Jul 24 2006 Petr Rockai <prockai at redhat.com> - 3.5.4-0.pre1
-- prerelease of 3.5.4 (from the first-cut tag)
-
-* Mon Jul 17 2006 Than Ngo <than at redhat.com> 3.5.3-3
-- BR: flex, needed to build kbabel
-
-* Fri Jul 14 2006 Than Ngo <than at redhat.com> 3.5.3-2
-- BR: autoconf automake libtool
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.5.3-1.1
-- rebuild
-
-* Fri Jun 02 2006 Than Ngo <than at redhat.com> 3.5.3-1
-- update to 3.5.3 
-
-* Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-1
-- update to 3.5.2
-
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 3.5.1-1 
-- 3.5.1
-
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Fri Dec 02 2005 Than Ngo <than at redhat.com> 2:3.5.0-1
-- 3.5
-
-* Wed Nov 09 2005 Than Ngo <than at redhat.com> 2:3.4.92-2 
-- get rid of xorg-x11-devel require
-
-* Tue Oct 25 2005 Than Ngo <than at redhat.com> 2:3.4.92-1
-- update to 3.5 Beta2
-
-* Tue Oct 04 2005 Than Ngo <than at redhat.com> 2:3.4.91-1
-- update to 3.5 Beta 1
-
-* Wed Sep 21 2005 Than Ngo <than at redhat.com> 2:3.4.2-2
-- fix uic build problem
-
-* Mon Aug 08 2005 Than Ngo <than at redhat.com> 3.4.2-1
-- update to 3.4.2
-
-* Tue Jun 28 2005 Than Ngo <than at redhat.com> 2:3.4.1-1
-- 3.4.1
-
-* Wed Apr 20 2005 Than Ngo <than at redhat.com> 2:3.4.0-3
-- fix dependency issue
-
-* Tue Apr 19 2005 Than Ngo <than at redhat.com> 2:3.4.0-2
-- buildrequires cleanup 
-
-* Fri Mar 18 2005 Than Ngo <than at redhat.com> 2:3.4.0-1
-- 3.4.0
-
-* Sat Mar 05 2005 Than Ngo <than at redhat.com> 2:3.4.0-0.rc1.2
-- fix gcc4 build problem
-
-* Mon Feb 28 2005 Than Ngo <than at redhat.com> 3.4.0-0.rc1.1
-- KDE 3.4.0 rc1
-
-* Tue Feb 22 2005 Than Ngo <than at redhat.com> 2:3.3.92-0.1
-- KDE-3.4 beta2
-
-* Sun Dec 05 2004 Than Ngo <than at redhat.com> 2:3.3.2-0.1
-- update to 3.3.2
-
-* Thu Nov 11 2004 Jeff Johnson <jbj at jbj.org> 2:3.3.1-3
-- rebuild against db-4.3.21.
-
-* Mon Oct 18 2004 Than Ngo <than at redhat.com> 2:3.3.1-2
-- rebuilt
-
-* Wed Oct 13 2004 Than Ngo <than at redhat.com> 2:3.3.1-1
-- update to 3.3.1
-
-* Mon Aug 23 2004 Than Ngo <than at redhat.com> 3.3.0-1
-- update to 3.3.0
-
-* Tue Aug 10 2004 Than Ngo <than at redhat.com> 3.3.0-0.1.rc2 
-- update to 3.3.0 rc2
-
-* Mon Jun 21 2004 Than Ngo <than at redhat.com> 2:3.2.3-1
-- update to 3.2.3
-
-* Wed May 05 2004 Than Ngo <than at redhat.com> 2:3.2.2-2
-- cleanup KDE/GNOME menu
-
-* Wed Apr 14 2004 Than Ngo <than at redhat.com> 2:3.2.2-1
-- update to 3.2.2
-
-* Sun Mar 07 2004 Than Ngo <than at redhat.com> 2:3.2.1-1
-- 3.2.1 release
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Tue Feb 24 2004 Than Ngo <than at redhat.com> 2:3.2.0-1.4
-- add BuildPrereq on db4-devel
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Sun Feb 08 2004 Than Ngo <than at redhat.com> 2:3.2.0-0.3
-- 3.2.0 release
-- built against qt-3.3.0
-
-* Wed Jan 21 2004 Than Ngo <than at redhat.com> 2:3.1.95-0.1
-- KDE 3.2 RC1
-
-* Mon Dec 01 2003 Than Ngo <than at redhat.com> 2:3.1.94-0.1
-- KDE 3.2 Beta2 
-- remove kdesdk-3.1.93-kcachegrind.patch, it's included in new upstream
-
-* Fri Nov 28 2003 Than Ngo <than at redhat.com> 2:3.1.93-0.4
-- fixed db4 issue 
-
-* Thu Nov 27 2003 Than Ngo <than at redhat.com> 2:3.1.93-0.3
-- get rid of rpath
-
-* Wed Nov 26 2003 Than Ngo <than at redhat.com> 2:3.1.93-0.2
-- fixed type conflict on x86_64
-
-* Thu Nov 13 2003 Than Ngo <than at redhat.com> 2:3.1.93-0.1
-- KDE 3.2 Beta1
-- cleanup
-
-* Tue Sep 30 2003 Than Ngo <than at redhat.com> 2:3.1.4-1
-- 3.1.4
-
-* Thu Aug 14 2003 Than Ngo <than at redhat.com> 2:3.1.3-3
-- add workaround for s390/s390x build problem
-
-* Wed Aug 13 2003 Than Ngo <than at redhat.com> 2:3.1.3-2
-- rebuilt
-
-* Tue Aug 12 2003 Than Ngo <than at redhat.com> 2:3.1.3-1
-- 3.1.3
-
-* Wed Jun 25 2003 Than Ngo <than at redhat.com> 3.1.2-5
-- rebuilt
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri May 23 2003 Than Ngo <than at redhat.com> 3.1.2-3
-- don't build kbugbuster, which is not used anymore.
-
-* Thu May 15 2003 Than Ngo <than at redhat.com> 3.1.2-2
-- respin
-
-* Wed May 14 2003 Than Ngo <than at redhat.com> 3.1.2-1
-- 3.1.2
-
-* Thu Mar 20 2003 Than Ngo <than at redhat.com> 3.1.1-1
-- 3.1.1
-
-* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
-- debuginfo rebuild
-
-* Fri Feb 21 2003 Than Ngo <than at redhat.com> 3.1-2
-- get rid of gcc path from dependency_libs
-
-* Tue Jan 28 2003 Than Ngo <than at redhat.com> 3.1-1
-- 3.1 release
-
-* Thu Jan 23 2003 Tim Powers <timp at redhat.com> 3.1-0.7
-- rebuild
-
-* Wed Jan 15 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.6
-- fix for ktrace (libc)
-
-* Tue Jan 14 2003 Thomas Woerner <twoerner at redhat.com> 3.1-0.5
-- rc6
-- removed size_t check
-
-* Sat Dec 21 2002 Than Ngo <than at redhat.com> 3.1-0.4
-- add Icons
-
-* Fri Dec 13 2002 Than Ngo <than at redhat.com> 3.1-0.3
-- fix package conflicts
-
-* Sat Nov 30 2002 Than Ngo <than at redhat.com> 3.1-0.2
-- desktop issues
-- get rid of sub packages
-- add new kdesdk-devel
-
-* Fri Nov 29 2002 Than Ngo <than at redhat.com> 3.1-0.1
-- update to 3.1 rc4
-
-* Tue Nov 19 2002 Than Ngo <than at redhat.com> 3.0.5-1.1
-- fix group issue (bug #78119)
-- remove Obsoletes kdesdk (bug #78138, #78139, #78140, #78141, #78142, #78143)
-
-* Sun Nov 10 2002 Than Ngo <than at redhat.com> 3.0.5-1
-- update to 3.0.5
-- add missing scripts, manpages and icons
-- remove a unneeded patch file
-
-* Tue Oct 15 2002 Than Ngo <than at redhat.com> 3.0.4-1
-- 3.0.4
-- Added missing documentations (bug #74550)
-
-* Mon Aug 19 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.3-1
-- 3.0.3
-
-* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-5
-- Rename libraries
-
-* Tue Apr  2 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-4
-- Fix bug #62259
-
-* Sun Mar 31 2002 Than Ngo <than at redhat.com> 3.0.0-3
-- fix bug #62388
-
-* Wed Mar 27 2002 Than Ngo <than at redhat.com> 3.0.0-2
-- final
-
-* Tue Mar 26 2002 Than Ngo <than at redhat.com> 3.0.0-0.cvs20020326.1
-- update
-
-* Sun Mar 24 2002 Than Ngo <than at redhat.com> 3.0.0-0.cvs20020324.1
-- update
-- fix bug #61671, #61670, #61656
-- add more buildrequires
-
-* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Wed Jan  2 2002 Bernhard Rosenkraenzer <bero at redhat.com> 3.0.0-0.cvs20020102.1
-- Update
-- Split in subpackages
-
-* Mon Aug  6 2001 Than Ngo <than at redhat.com> 2.2-1
-- update to 2.2 release
-
-* Sat Aug  04 2001 Than Ngo <than at redhat.com> 2.2-0.cvs20010804.1
-- update
-- fix bug #50665
-
-* Tue Jul 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010724.1
-- Remove extractrc (it's in kdevelop)
-- remove ia64 workarounds
-
-* Mon Jul 23 2001 Bernhard Rosenkraenzer <bero at redhat.com> 2.2-0.cvs20010723.1
-- update
-
-* Wed Feb 21 2001 Than Ngo <than at redhat.com>
-- 2.1-respin
-- fix dangling symlink
-
-* Tue Feb 20 2001 Than Ngo <than at redhat.com>
-- update to 2.1
-
-* Fri Feb 16 2001 Than Ngo <than at redhat.com>
-- fix to build against glibc
-- obsolete ktranslator kless (from powertools)
-- clean up specfile
-- add missing %post and %postun (ldconfig)
-
-* Tue Feb  6 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- Rebuild to get rid of libkdefakes.so.0 requirement
-- Obsolete kbabel (from Powertools)
+* Thu Dec 06 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-2
+- drop kbabel from description (not actually there)
+- reenable kompare, fix its build and porting bugs (kde#153463)
+- add missing BR subversion-devel, add files for kio_svn to list
+- add missing BR binutils-devel (for libiberty), add files for kmtrace to list
+
+* Fri Nov 30 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.2-1
+- kde-3.96.2
+
+* Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.1-1
+- kde-3.96.1
+
+* Mon Nov 19 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.0-2
+- (Build)Require: kdebase-workspace(-devel) (for kate)
+- re-enable kate
+- BR: kde-filesystem >= 4
 
-* Sun Jan 28 2001 Bernhard Rosenkraenzer <bero at redhat.com>
-- initial RPM
+* Sun Nov 18 2007 Sebastian Vahl <fedora at deadbabylon.de> 3.96.0-1
+- Initial version for Fedora


--- kdesdk-3.5.4-multilib.patch DELETED ---


--- kdesdk-3.5.7-subversion.patch DELETED ---




More information about the fedora-extras-commits mailing list