From eb8c1de42cd65fa4c38543d6aa7d787ad7d529fc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 22 2008 14:49:19 +0000
Subject: - -utils should not depend on kdelibs etc (#467984)


---

diff --git a/kdesdk-4.1.2-kdecore.patch b/kdesdk-4.1.2-kdecore.patch
new file mode 100644
index 0000000..63de776
--- /dev/null
+++ b/kdesdk-4.1.2-kdecore.patch
@@ -0,0 +1,39 @@
+diff -up kdesdk-4.1.2/poxml/CMakeLists.txt.libs kdesdk-4.1.2/poxml/CMakeLists.txt
+--- kdesdk-4.1.2/poxml/CMakeLists.txt.libs	2008-08-28 03:07:26.000000000 -0500
++++ kdesdk-4.1.2/poxml/CMakeLists.txt	2008-10-22 09:39:06.000000000 -0500
+@@ -11,7 +11,7 @@ set(split2po_SRCS split.cpp parser.cpp)
+ 
+ kde4_add_executable(split2po ${split2po_SRCS})
+ 
+-target_link_libraries(split2po ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
++target_link_libraries(split2po ${QT_QTXML_LIBRARY})
+ 
+ install(TARGETS split2po  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+@@ -23,7 +23,7 @@ set(xml2pot_SRCS xml2pot.cpp parser.cpp)
+ 
+ kde4_add_executable(xml2pot ${xml2pot_SRCS})
+ 
+-target_link_libraries(xml2pot ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
++target_link_libraries(xml2pot ${QT_QTXML_LIBRARY} )
+ 
+ install(TARGETS xml2pot  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+@@ -42,7 +42,7 @@ set(po2xml_SRCS 
+ kde4_add_executable(po2xml ${po2xml_SRCS})
+ add_dependencies(po2xml antlr)
+ 
+-target_link_libraries(po2xml antlr ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(po2xml antlr ${QT_QTXML_LIBRARY})
+ 
+ install(TARGETS po2xml  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+@@ -59,7 +59,7 @@ set(swappo_SRCS 
+ kde4_add_executable(swappo ${swappo_SRCS})
+ add_dependencies(swappo antlr)
+ 
+-target_link_libraries(swappo  antlr ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(swappo  antlr ${QT_QTXML_LIBRARY})
+ 
+ install(TARGETS swappo  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
diff --git a/kdesdk.spec b/kdesdk.spec
index 4489b1a..7eb8ebe 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -1,7 +1,7 @@
 
 Name:           kdesdk
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,10 +9,13 @@ Group:          User Interface/Desktops
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-# upstream patches
-Patch100:       kdesdk-4.1.1-quit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.redhat.com/467984
+Patch1: kdesdk-4.1.2-kdecore.patch
+## upstream patches
+Patch100:       kdesdk-4.1.1-quit.patch
+
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires:  kdelibs4-devel >= %{version}
@@ -36,19 +39,18 @@ BuildRequires:  boost-devel
 #            GPLv2+/LGPLv2+
 BuildRequires:  binutils-devel
 
-# FIXME/TODO: are there other explicit Requires?
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 Requires: kdebase-workspace >= %{version}
 Requires: %{name}-libs = %{version}-%{release}
-# not *strictly* required -- Rex
+
+# not *strictly* required, helps upgrade case so tools don't disappear
 Requires(hint): %{name}-utils = %{version}-%{release}
 
 Provides:      kaider = %{version}-%{release}
 Obsoletes:     kaider < %{version}-%{release}
-# TODO: Shouldn't we Provides: lokalize too/instead?
 
 %description
 A collection of applications and tools used by developers, including:
@@ -89,6 +91,8 @@ xml2pot
 %prep
 %setup -q
 
+%patch1 -p1 -b .kdecore
+
 # upstream patches
 %patch100 -p1 -b .quit
 
@@ -220,6 +224,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 22 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-3
+- -utils should not depend on kdelibs etc (#467984)
+
 * Mon Sep 29 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.2-2
 - make VERBOSE=1
 - respin against new(er) kde-filesystem