[kmess] kmess-2.0.6.1 (#676443) make qca-ossl dep arch'd add minimal kdelibs4 runtime dep

Wed Mar 16 15:23:19 UTC 2011

commit 4907af40823aeb46d8c24392910d90f70fffe4a3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 16 10:23:18 2011 -0500

    kmess-2.0.6.1 (#676443)
    make qca-ossl dep arch'd
    add minimal kdelibs4 runtime dep

 kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch |   17 +++++++++
 kmess-2.0.6.1-kmesssendpluginlib_static.patch     |   12 ++++++
 kmess.spec                                        |   39 ++++++++++++++++++---
 3 files changed, 63 insertions(+), 5 deletions(-)
---

diff --git a/kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch b/kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch
new file mode 100644
index 0000000..765aca0
--- /dev/null
+++ b/kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch
@@ -0,0 +1,17 @@
+diff -up kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt.DSOLinking kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt
+--- kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt.DSOLinking	2011-02-16 01:16:45.000000000 -0600
++++ kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt	2011-03-16 09:11:29.545525485 -0500
+@@ -16,10 +16,12 @@ ADD_LIBRARY( kmesssendpluginlib
+ 
+ ADD_DEPENDENCIES( kmesssendpluginlib kmess )
+ 
++TARGET_LINK_LIBRARIES( kmesssendpluginlib ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} )
++
+ KDE4_ADD_PLUGIN( kmesssendplugin WITH_PREFIX ${kmesssendplugin_SOURCES} )
+ ADD_DEPENDENCIES( kmesssendplugin kmesssendpluginlib kmess )
+ 
+-TARGET_LINK_LIBRARIES( kmesssendplugin kmesssendpluginlib konq ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} )
++TARGET_LINK_LIBRARIES( kmesssendplugin kmesssendpluginlib konq ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTDBUS_LIBRARY} )
+ 
+ INSTALL( TARGETS kmesssendplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
diff --git a/kmess-2.0.6.1-kmesssendpluginlib_static.patch b/kmess-2.0.6.1-kmesssendpluginlib_static.patch
new file mode 100644
index 0000000..e30f7ba
--- /dev/null
+++ b/kmess-2.0.6.1-kmesssendpluginlib_static.patch
@@ -0,0 +1,12 @@
+diff -up kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt.kmesssendpluginlib_static kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt
+--- kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt.kmesssendpluginlib_static	2011-03-16 10:16:54.368385114 -0500
++++ kmess-2.0.6.1/src/utils/kmess-send/CMakeLists.txt	2011-03-16 10:16:10.077047473 -0500
+@@ -7,7 +7,7 @@ SET( kmesssendplugin_SOURCES
+ 
+ ADD_DEFINITIONS(-fPIC)
+ 
+-ADD_LIBRARY( kmesssendpluginlib
++ADD_LIBRARY( kmesssendpluginlib STATIC
+    ../kmessdbusdatatypes.cpp
+    ../../contact/msnstatus.cpp
+    ../../kmessdebug.cpp
diff --git a/kmess.spec b/kmess.spec
index 226dc73..89c7f69 100644
--- a/kmess.spec
+++ b/kmess.spec
@@ -1,6 +1,6 @@
 Name: kmess
-Version: 2.0.5
-Release: 3%{?dist}
+Version: 2.0.6.1
+Release: 1%{?dist}
 Summary: Messaging client for MSN
 Group: Applications/Internet
 License: GPLv2+
@@ -10,6 +10,14 @@ Source0: http://downloads.sourceforge.net/kmess/kmess-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+# attempt 1, incomplete, requires source re-engineering to ensure
+# no unresolvable symbols in shlib convenience lib
+Patch50: kmess-2.0.6.1-kmesssendpluginlib_dsolinking.patch
+# attempt 2, it's a convenience lib, intention is probably to build
+# this static anyway
+patch51: kmess-2.0.6.1-kmesssendpluginlib_static.patch
+
 BuildRequires:  kdelibs4-devel >= 4.2
 BuildRequires:  cmake
 BuildRequires:  qca2-devel
@@ -24,7 +32,19 @@ BuildRequires:  libgcrypt-devel
 # removed konqueror integration till the bugs are worked out
 #BuildRequires:  kdebase-devel
 
-Requires: qca-ossl
+#-----------------------------------------------------------------------------
+#-- The following OPTIONAL packages could NOT be located on your system.
+#-- Consider installing them to enable more features from this software.
+#-----------------------------------------------------------------------------
+#   * LibISF-Qt  <http://www.kmess.org/>
+#     Library to manage Microsoft's Mobile Ink
+#     Support to send handwriting messages in a format compatible with Windows Live Messenger.
+#     In absence of an installed isf-qt version, the bundled version will be compiled.
+
+# bigger apps usually want kdebase-runtime, but this one can probably
+# get away without it -- Rex
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
+Requires: qca-ossl%{?_isa}
 
 %description
 KMess is an alternative MSN Messenger chat client for Linux. 
@@ -37,6 +57,9 @@ interface.
 %prep
 %setup -q -n %{name}-%{version}
 
+#patch50 -p1 -b .kmesssendpluginlib_dsolinking
+%patch51 -p1 -b .kmesssendpluginlib_static
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -49,8 +72,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-touch kmess.lang
-%find_lang kmess --with-kde || echo "NOTICE: translations missing!"
+%find_lang kmess --with-kde || (touch kmess.lang; echo "NOTICE: translations missing!")
 
 
 %check
@@ -81,8 +103,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_kde4_appsdir}/kmess/
 %{_kde4_iconsdir}/hicolor/*/*/kmess.*
 %{_kde4_datadir}/sounds/kmess*
+%{_kde4_datadir}/kde4/services/kmesssendplugin.desktop
+%{_kde4_libdir}/kde4/libkmesssendplugin.so
 
 %changelog
+* Wed Mar 16 2011 Rex Dieter <rdieter at fedoraproject.org> 2.0.6.1-1
+- kmess-2.0.6.1 (#676443)
+- make qca-ossl dep arch'd
+- add minimal kdelibs4 runtime dep
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
