rpms/kdesdk/devel kdesdk-3.97.0-fix-kompare.patch, 1.1, 1.2 kdesdk.spec, 1.84, 1.85

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdesdk-3.97.0-fix-kompare.patch kdesdk.spec 
Log Message:
* Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
- don't look for libkompare*part.so in %%{_kde4_libdir}
- don't list D-Bus interfaces twice in file list
- build Kompare documentation

kdesdk-3.97.0-fix-kompare.patch:

Index: kdesdk-3.97.0-fix-kompare.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk-3.97.0-fix-kompare.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesdk-3.97.0-fix-kompare.patch	16 Dec 2007 00:40:08 -0000	1.1
+++ kdesdk-3.97.0-fix-kompare.patch	16 Dec 2007 01:01:39 -0000	1.2
@@ -15,6 +15,20 @@
  macro_optional_add_subdirectory(kprofilemethod)
  message(STATUS "remember to port kspy to Qt4's metaobjects")
  #add_subdirectory(kspy)
+Index: doc/CMakeLists.txt
+===================================================================
+--- doc/CMakeLists.txt	(revision 745228)
++++ doc/CMakeLists.txt	(revision 748928)
+@@ -4,8 +4,7 @@
+ add_subdirectory(kapptemplate)
+ add_subdirectory(kbugbuster)
+ add_subdirectory(kcachegrind)
+-MESSAGE(STATUS "disable kompare until we port it")
+-#add_subdirectory(kompare)
++add_subdirectory(kompare)
+ add_subdirectory(scripts)
+ 
+ if(LIBXSLT_FOUND AND LIBXML2_FOUND)
 Index: kompare/libdiff2/diffmodel.h
 ===================================================================
 --- kompare/libdiff2/diffmodel.h	(revision 745228)


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdesdk.spec	16 Dec 2007 00:40:08 -0000	1.84
+++ kdesdk.spec	16 Dec 2007 01:01:39 -0000	1.85
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        3.97.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -93,7 +93,7 @@
 do
   case "$i" in
     # all these are not symlinks
-    libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so|libkomparenavtreepart.so|libkomparepart.so)
+    libkdeinit4_*.so|libkomparedialogpages.so|libkomparediff2.so)
       ;;
     *)
       linktarget=`readlink "$i"`
@@ -152,6 +152,7 @@
 %{_kde4_docdir}/HTML/en/kbugbuster/
 %{_kde4_docdir}/HTML/en/kcachegrind/
 %{_kde4_docdir}/HTML/en/kdesvn-build/
+%{_kde4_docdir}/HTML/en/kompare/
 %{_kde4_docdir}/HTML/en/umbrello/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -160,15 +161,12 @@
 %{_kde4_libdir}/strigi/*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
-%{_datadir}/dbus-1/interfaces/*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkomparedialogpages.so
 %{_kde4_libdir}/libkomparediff2.so
-%{_kde4_libdir}/libkomparenavtreepart.so
-%{_kde4_libdir}/libkomparepart.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -176,6 +174,11 @@
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
+- don't look for libkompare*part.so in %%{_kde4_libdir}
+- don't list D-Bus interfaces twice in file list
+- build Kompare documentation
+
 * Sun Dec 16 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-6
 - update Kompare from SVN (rev 748928)
 - Kompare now installs unversioned (private) shared libs, package them properly