rpms/kdesdk/devel kdesdk-3.97.0-kompare-shared-libs.patch, NONE, 1.1 kdesdk.spec, 1.80, 1.81

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-3.97.0-kompare-shared-libs.patch 
Log Message:
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
- build Kompare's convenience libraries as shared so we don't end up with
  non-PIC static libraries linked into shared libraries

kdesdk-3.97.0-kompare-shared-libs.patch:

--- NEW FILE kdesdk-3.97.0-kompare-shared-libs.patch ---
diff -ur kdesdk-3.96.2-fix-kompare-rev6/kompare/libdialogpages/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/CMakeLists.txt
--- kdesdk-3.96.2-fix-kompare-rev6/kompare/libdialogpages/CMakeLists.txt	2007-07-26 12:38:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/CMakeLists.txt	2007-12-11 07:26:34.000000000 +0100
@@ -15,7 +15,8 @@
 	viewpage.cpp )
 
 
-kde4_add_library(dialogpages ${dialogpages_PART_SRCS})
+kde4_add_library(dialogpages SHARED ${dialogpages_PART_SRCS})
+set_target_properties(dialogpages PROPERTIES VERSION ${KDE_GENERIC_LIB_VERSION} SOVERSION ${KDE_GENERIC_LIB_SOVERSION})
 
 target_link_libraries(dialogpages  ${KDE4_KDECORE_LIBS} )
 
diff -ur kdesdk-3.96.2-fix-kompare-rev6/kompare/libdiff2/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/libdiff2/CMakeLists.txt
--- kdesdk-3.96.2-fix-kompare-rev6/kompare/libdiff2/CMakeLists.txt	2007-07-26 12:38:10.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdiff2/CMakeLists.txt	2007-12-11 07:26:47.000000000 +0100
@@ -19,7 +19,8 @@
 	perforceparser.cpp )
 
 
-kde4_add_library(diff2 ${diff2_PART_SRCS})
+kde4_add_library(diff2 SHARED ${diff2_PART_SRCS})
+set_target_properties(diff2 PROPERTIES VERSION ${KDE_GENERIC_LIB_VERSION} SOVERSION ${KDE_GENERIC_LIB_SOVERSION})
 
 target_link_libraries(diff2  ${KDE4_KDECORE_LIBS} )
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- kdesdk.spec	10 Dec 2007 23:52:54 -0000	1.80
+++ kdesdk.spec	11 Dec 2007 06:29:57 -0000	1.81
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        3.97.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,7 @@
 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
+Patch1:         kdesdk-3.97.0-kompare-shared-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -83,9 +85,6 @@
 mkdir %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# remove static libraries internal to Kompare
-rm -f %{buildroot}%{_kde4_libdir}/libdialogpages.a %{buildroot}%{_kde4_libdir}/libdiff2.a
-
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
@@ -171,6 +170,10 @@
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
+- build Kompare's convenience libraries as shared so we don't end up with
+  non-PIC static libraries linked into shared libraries
+
 * Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
 - updated fix-kompare patch (rev 6)