rpms/kdesdk/devel kdesdk-3.96.2-fix-kompare.patch, 1.2, 1.3 kdesdk.spec, 1.79, 1.80

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdesdk-3.96.2-fix-kompare.patch kdesdk.spec 
Log Message:
* Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
- updated fix-kompare patch (rev 6)

kdesdk-3.96.2-fix-kompare.patch:

Index: kdesdk-3.96.2-fix-kompare.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk-3.96.2-fix-kompare.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdesdk-3.96.2-fix-kompare.patch	10 Dec 2007 11:59:03 -0000	1.2
+++ kdesdk-3.96.2-fix-kompare.patch	10 Dec 2007 23:52:54 -0000	1.3
@@ -3859,7 +3859,7 @@
  	stdFixed.setPointSize( 10 );
 diff -Nur kdesdk-3.96.2-orig/kompare/libdiff2/komparemodellist.cpp kdesdk-3.96.2-fix-kompare/kompare/libdiff2/komparemodellist.cpp
 --- kdesdk-3.96.2-orig/kompare/libdiff2/komparemodellist.cpp	2007-08-29 11:55:07.000000000 +0200
-+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/komparemodellist.cpp	2007-12-05 07:44:18.000000000 +0100
++++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/komparemodellist.cpp	2007-12-11 00:40:21.000000000 +0100
 @@ -23,15 +23,17 @@
  #include <qtextcodec.h>
  #include <q3valuelist.h>
@@ -3943,12 +3943,13 @@
  	m_previousDifference->setEnabled( false );
  	m_nextDifference->setEnabled( false );
  
-@@ -293,16 +304,16 @@
+@@ -293,16 +304,17 @@
  	if( !model->isModified() )
  		return true;
  
 -	KTempFile* temp = new KTempFile();
 +	KTemporaryFile* temp = new KTemporaryFile();
++	temp->open();
  
  	if( temp->status() != 0 ) {
  		emit error( i18n( "Could not open a temporary file." ) );
@@ -3963,7 +3964,7 @@
  	QStringList list;
  
  	DiffHunkListConstIterator hunkIt = model->hunks()->begin();
-@@ -343,12 +354,12 @@
+@@ -343,12 +355,12 @@
  	// kDebug( 8101 ) << "Everything: " << endl << list.join( "\n" ) << endl;
  
  	if( list.count() > 0 )
@@ -3978,7 +3979,7 @@
  		delete temp;
  		return false;
  	}
-@@ -388,7 +399,7 @@
+@@ -388,7 +400,7 @@
  	else
  	{
  		//model->slotSetModified( false );
@@ -3987,12 +3988,13 @@
  		delete temp;
  	}
  
-@@ -571,12 +582,12 @@
+@@ -571,12 +583,13 @@
  {
  	kDebug() << "KompareModelList::saveDiff: " << endl;
  
 -	m_diffTemp = new KTempFile();
 +	m_diffTemp = new KTemporaryFile();
++	m_diffTemp->open();
  	m_diffURL = url;
  
  	if( m_diffTemp->status() != 0 ) {
@@ -4002,7 +4004,7 @@
  		delete m_diffTemp;
  		m_diffTemp = 0;
  		return false;
-@@ -598,9 +609,9 @@
+@@ -598,9 +611,9 @@
  
  	if( success )
  	{
@@ -4014,7 +4016,7 @@
  
  		m_diffTemp->close();
  
-@@ -615,7 +626,7 @@
+@@ -615,7 +628,7 @@
  	}
  
  	m_diffURL.truncate( 0 );
@@ -4023,7 +4025,7 @@
  
  	delete m_diffTemp;
  	m_diffTemp = 0;
-@@ -856,6 +867,7 @@
+@@ -856,6 +869,7 @@
  int KompareModelList::parseDiffOutput( const QString& diff )
  {
  	kDebug(8101) << "KompareModelList::parseDiffOutput" << endl;
@@ -4031,7 +4033,7 @@
  
  	QStringList diffLines = split( diff );
  
-@@ -949,10 +961,14 @@
+@@ -949,10 +963,14 @@
  
  	int srcLineNo = 1, destLineNo = 1;
  


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdesdk.spec	10 Dec 2007 11:59:03 -0000	1.79
+++ kdesdk.spec	10 Dec 2007 23:52:54 -0000	1.80
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        3.97.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -171,6 +171,9 @@
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
+- updated fix-kompare patch (rev 6)
+
 * Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
 - updated fix-kompare patch (rev 5)