packages: kadu/kadu.spec, kadu/kadu-libsuffix.patch (NEW) - upstream libsuf...
cactus
cactus at pld-linux.org
Thu May 28 00:03:29 CEST 2009
Author: cactus Date: Wed May 27 22:03:29 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- upstream libsuffix patch, but for external modules hack still needed
- rel 4
---- Files affected:
packages/kadu:
kadu.spec (1.216 -> 1.217) , kadu-libsuffix.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.216 packages/kadu/kadu.spec:1.217
--- packages/kadu/kadu.spec:1.216 Sat May 16 16:35:09 2009
+++ packages/kadu/kadu.spec Thu May 28 00:03:23 2009
@@ -108,7 +108,7 @@
Summary(pl.UTF-8): Klient Gadu-Gadu do przesyłania wiadomości po sieci
Name: kadu
Version: 0.6.5.2
-Release: 3
+Release: 4
License: GPL v2
Group: Applications/Communications
Source0: http://kadu.net/download/stable/%{name}-%{version}.tar.bz2
@@ -204,6 +204,7 @@
# Source47-md5: cf7d7c8f86d9cfe4b5a0ab52b5deff34
Patch0: %{name}-weather-duplicated-translation-fix.patch
Patch1: %{name}-gcc44.patch
+Patch2: %{name}-libsuffix.patch
URL: http://kadu.net/
BuildRequires: Qt3Support-devel >= 4.4
BuildRequires: QtScript-devel >= 4.4
@@ -1026,6 +1027,7 @@
%prep
%setup -q -T -b 0 -n %{name}
%patch1 -p1
+%patch2 -p0
%if %{with agent}
tar xzf %{SOURCE17} -C modules
@@ -1152,12 +1154,10 @@
tar xzf %{SOURCE34} -C varia/themes/icons
tar xzf %{SOURCE41} -C varia/themes/icons
-# Drop this in 0.6.6 - fix modules install on x86_64
+# Drop this in 0.6.6 - fix external modules installation on x86_64
%if "%{_lib}" == "lib64"
%{__sed} -i 's/lib\/kadu\/modules/lib64\/kadu\/modules/' modules/*/CMakeLists.txt
%{__sed} -i 's/lib\/kadu\/modules/lib64\/kadu\/modules/' modules/mime_tex/mimetex/CMakeLists.txt
-# Change hard coded path to modules libs
-%{__sed} -i 's#/lib#/lib64#' kadu-core/misc.cpp
%endif
# Change hard coded path to modules data files
@@ -2183,6 +2183,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.217 2009/05/27 22:03:23 cactus
+- upstream libsuffix patch, but for external modules hack still needed
+- rel 4
+
Revision 1.216 2009/05/16 14:35:09 adamg
- release 3, builds fine on all archs
================================================================
Index: packages/kadu/kadu-libsuffix.patch
diff -u /dev/null packages/kadu/kadu-libsuffix.patch:1.1
--- /dev/null Thu May 28 00:03:29 2009
+++ packages/kadu/kadu-libsuffix.patch Thu May 28 00:03:23 2009
@@ -0,0 +1,1508 @@
+Index: modules/bmpx_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/bmpx_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/bmpx_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -18,5 +18,5 @@
+ if (bmpx_mediaplayer STREQUAL STATIC)
+ set_target_properties(bmpx_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (bmpx_mediaplayer STREQUAL STATIC)
+- install (TARGETS bmpx_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS bmpx_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (bmpx_mediaplayer STREQUAL STATIC)
+Index: modules/itunes_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/itunes_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/itunes_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -21,5 +21,5 @@
+ if (APPLE)
+ set_target_properties(itunes_mediaplayer PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS itunes_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS itunes_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (itunes_mediaplayer STREQUAL STATIC)
+Index: modules/hints/CMakeLists.txt
+===================================================================
+--- modules/hints/CMakeLists.txt (wersja 6633)
++++ modules/hints/CMakeLists.txt (wersja 6634)
+@@ -51,6 +51,6 @@
+ if (APPLE)
+ set_target_properties(hints PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS hints DESTINATION lib/kadu/modules)
++ install (TARGETS hints DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (hints STREQUAL STATIC)
+
+Index: modules/dcc/CMakeLists.txt
+===================================================================
+--- modules/dcc/CMakeLists.txt (wersja 6633)
++++ modules/dcc/CMakeLists.txt (wersja 6634)
+@@ -59,6 +59,6 @@
+ if (APPLE)
+ set_target_properties(dcc PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS dcc DESTINATION lib/kadu/modules)
++ install (TARGETS dcc DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (dcc STREQUAL STATIC)
+
+Index: modules/window_notify/CMakeLists.txt
+===================================================================
+--- modules/window_notify/CMakeLists.txt (wersja 6633)
++++ modules/window_notify/CMakeLists.txt (wersja 6634)
+@@ -42,6 +42,6 @@
+ if (APPLE)
+ set_target_properties(pcspeaker PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS window_notify DESTINATION lib/kadu/modules)
++ install (TARGETS window_notify DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (window_notify STREQUAL STATIC)
+
+Index: modules/vlc_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/vlc_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/vlc_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -18,5 +18,5 @@
+ if (vlc_mediaplayer STREQUAL STATIC)
+ set_target_properties(vlc_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (vlc_mediaplayer STREQUAL STATIC)
+- install (TARGETS vlc_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS vlc_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (vlc_mediaplayer STREQUAL STATIC)
+Index: modules/cenzor/CMakeLists.txt
+===================================================================
+--- modules/cenzor/CMakeLists.txt (wersja 6633)
++++ modules/cenzor/CMakeLists.txt (wersja 6634)
+@@ -47,6 +47,6 @@
+ if (APPLE)
+ set_target_properties(cenzor PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS cenzor DESTINATION lib/kadu/modules)
++ install (TARGETS cenzor DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (cenzor STREQUAL STATIC)
+
+Index: modules/phonon_sound/CMakeLists.txt
+===================================================================
+--- modules/phonon_sound/CMakeLists.txt (wersja 6633)
++++ modules/phonon_sound/CMakeLists.txt (wersja 6634)
+@@ -29,6 +29,6 @@
+ if (APPLE)
+ set_target_properties(phonon_sound PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS phonon_sound DESTINATION lib/kadu/modules)
++ install (TARGETS phonon_sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (phonon_sound STREQUAL STATIC)
+
+Index: modules/autostatus/CMakeLists.txt
+===================================================================
+--- modules/autostatus/CMakeLists.txt (wersja 6633)
++++ modules/autostatus/CMakeLists.txt (wersja 6634)
+@@ -44,6 +44,6 @@
+ if (APPLE)
+ set_target_properties(autostatus PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS autostatus DESTINATION lib/kadu/modules)
++ install (TARGETS autostatus DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (autostatus STREQUAL STATIC)
+
+Index: modules/gg_avatars/CMakeLists.txt
+===================================================================
+--- modules/gg_avatars/CMakeLists.txt (wersja 6633)
++++ modules/gg_avatars/CMakeLists.txt (wersja 6634)
+@@ -51,6 +51,6 @@
+ if (APPLE)
+ set_target_properties(gg_avatars PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS gg_avatars DESTINATION lib/kadu/modules)
++ install (TARGETS gg_avatars DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (gg_avatars STREQUAL STATIC)
+
+Index: modules/qt4_sound/CMakeLists.txt
+===================================================================
+--- modules/qt4_sound/CMakeLists.txt (wersja 6633)
++++ modules/qt4_sound/CMakeLists.txt (wersja 6634)
+@@ -26,6 +26,6 @@
+ if (APPLE)
+ set_target_properties(qt4_sound PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS qt4_sound DESTINATION lib/kadu/modules)
++ install (TARGETS qt4_sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (qt4_sound STREQUAL STATIC)
+
+Index: modules/growl_notify/CMakeLists.txt
+===================================================================
+--- modules/growl_notify/CMakeLists.txt (wersja 6633)
++++ modules/growl_notify/CMakeLists.txt (wersja 6634)
+@@ -34,6 +34,6 @@
+ if (APPLE)
+ set_target_properties(growl_notify PROPERTIES LINK_FLAGS "-undefined dynamic_lookup -framework Growl -framework CoreFoundation")
+ endif (APPLE)
+- install (TARGETS growl_notify DESTINATION lib/kadu/modules)
++ install (TARGETS growl_notify DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (growl_notify STREQUAL STATIC)
+
+Index: modules/alsa_sound/CMakeLists.txt
+===================================================================
+--- modules/alsa_sound/CMakeLists.txt (wersja 6633)
++++ modules/alsa_sound/CMakeLists.txt (wersja 6634)
+@@ -41,6 +41,6 @@
+ if (alsa_sound STREQUAL STATIC)
+ set_target_properties(alsa_sound PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (alsa_sound STREQUAL STATIC)
+- install (TARGETS alsa_sound DESTINATION lib/kadu/modules)
++ install (TARGETS alsa_sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (alsa_sound STREQUAL STATIC)
+
+Index: modules/account_management/CMakeLists.txt
+===================================================================
+--- modules/account_management/CMakeLists.txt (wersja 6633)
++++ modules/account_management/CMakeLists.txt (wersja 6634)
+@@ -50,6 +50,6 @@
+ if (APPLE)
+ set_target_properties(account_management PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS account_management DESTINATION lib/kadu/modules)
++ install (TARGETS account_management DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (account_management STREQUAL STATIC)
+
+Index: modules/osd_hints/CMakeLists.txt
+===================================================================
+--- modules/osd_hints/CMakeLists.txt (wersja 6633)
++++ modules/osd_hints/CMakeLists.txt (wersja 6634)
+@@ -108,5 +108,5 @@
+ if (APPLE)
+ set_target_properties(osd_hints PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS osd_hints DESTINATION lib/kadu/modules)
++ install (TARGETS osd_hints DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (osd_hints STREQUAL STATIC)
+Index: modules/agent/CMakeLists.txt
+===================================================================
+--- modules/agent/CMakeLists.txt (wersja 6633)
++++ modules/agent/CMakeLists.txt (wersja 6634)
+@@ -41,6 +41,6 @@
+ if (APPLE)
+ set_target_properties(agent PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS agent DESTINATION lib/kadu/modules)
++ install (TARGETS agent DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (agent STREQUAL STATIC)
+
+Index: modules/powerkadu/CMakeLists.txt
+===================================================================
+--- modules/powerkadu/CMakeLists.txt (wersja 6633)
++++ modules/powerkadu/CMakeLists.txt (wersja 6634)
+@@ -53,4 +53,4 @@
+ endif (powerkadu STREQUAL STATIC)
+ add_dependencies (powerkadu powerkadu-translations)
+
+-install (TARGETS powerkadu DESTINATION lib/kadu/modules)
++install (TARGETS powerkadu DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+Index: modules/history/CMakeLists.txt
+===================================================================
+--- modules/history/CMakeLists.txt (wersja 6633)
++++ modules/history/CMakeLists.txt (wersja 6634)
+@@ -53,6 +53,6 @@
+ if (APPLE)
+ set_target_properties(history PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS history DESTINATION lib/kadu/modules)
++ install (TARGETS history DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (history STREQUAL STATIC)
+
+Index: modules/auto_hide/CMakeLists.txt
+===================================================================
+--- modules/auto_hide/CMakeLists.txt (wersja 6633)
++++ modules/auto_hide/CMakeLists.txt (wersja 6634)
+@@ -40,6 +40,6 @@
+ if (APPLE)
+ set_target_properties(auto_hide PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS auto_hide DESTINATION lib/kadu/modules)
++ install (TARGETS auto_hide DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (auto_hide STREQUAL STATIC)
+
+Index: modules/sms/CMakeLists.txt
+===================================================================
+--- modules/sms/CMakeLists.txt (wersja 6633)
++++ modules/sms/CMakeLists.txt (wersja 6634)
+@@ -47,6 +47,6 @@
+ if (APPLE)
+ set_target_properties(sms PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS sms DESTINATION lib/kadu/modules)
++ install (TARGETS sms DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (sms STREQUAL STATIC)
+
+Index: modules/qt4_docking/CMakeLists.txt
+===================================================================
+--- modules/qt4_docking/CMakeLists.txt (wersja 6633)
++++ modules/qt4_docking/CMakeLists.txt (wersja 6634)
+@@ -33,7 +33,7 @@
+ if (APPLE)
+ set_target_properties(qt4_docking PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS qt4_docking DESTINATION lib/kadu/modules)
++ install (TARGETS qt4_docking DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (qt4_docking STREQUAL STATIC)
+
+
+Index: modules/amarok1_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/amarok1_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/amarok1_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -18,5 +18,5 @@
+ if (amarok1_mediaplayer STREQUAL STATIC)
+ set_target_properties(amarok1_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (amarok1_mediaplayer STREQUAL STATIC)
+- install (TARGETS amarok1_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS amarok1_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (amarok1_mediaplayer STREQUAL STATIC)
+Index: modules/amarok2_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/amarok2_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/amarok2_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -20,5 +20,5 @@
+ if (amarok2_mediaplayer STREQUAL STATIC)
+ set_target_properties(amarok2_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (amarok2_mediaplayer STREQUAL STATIC)
+- install (TARGETS amarok2_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS amarok2_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (amarok2_mediaplayer STREQUAL STATIC)
+Index: modules/win32_sound/CMakeLists.txt
+===================================================================
+--- modules/win32_sound/CMakeLists.txt (wersja 6633)
++++ modules/win32_sound/CMakeLists.txt (wersja 6634)
+@@ -48,4 +48,4 @@
+ endif (win32_sound STREQUAL STATIC)
+ add_dependencies (win32_sound win32_sound-translations)
+
+-install (TARGETS win32_sound DESTINATION lib/kadu/modules)
++install (TARGETS win32_sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+Index: modules/screenshot/CMakeLists.txt
+===================================================================
+--- modules/screenshot/CMakeLists.txt (wersja 6633)
++++ modules/screenshot/CMakeLists.txt (wersja 6634)
+@@ -44,6 +44,6 @@
+ if (APPLE)
+ set_target_properties(screenshot PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS screenshot DESTINATION lib/kadu/modules)
++ install (TARGETS screenshot DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (screenshot STREQUAL STATIC)
+
+Index: modules/echo/CMakeLists.txt
+===================================================================
+--- modules/echo/CMakeLists.txt (wersja 6633)
++++ modules/echo/CMakeLists.txt (wersja 6634)
+@@ -26,7 +26,7 @@
+ if (WIN32)
+ target_link_libraries(echo kadu_core)
+ endif (WIN32)
+- install (TARGETS echo DESTINATION lib/kadu/modules)
++ install (TARGETS echo DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (echo STREQUAL STATIC)
+
+
+Index: modules/word_fix/CMakeLists.txt
+===================================================================
+--- modules/word_fix/CMakeLists.txt (wersja 6633)
++++ modules/word_fix/CMakeLists.txt (wersja 6634)
+@@ -46,6 +46,6 @@
+ if (APPLE)
+ set_target_properties(word_fix PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS word_fix DESTINATION lib/kadu/modules)
++ install (TARGETS word_fix DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (word_fix STREQUAL STATIC)
+
+Index: modules/xmms2_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/xmms2_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/xmms2_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -18,5 +18,5 @@
+ if (xmms2_mediaplayer STREQUAL STATIC)
+ set_target_properties(xmms2_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (xmms2_mediaplayer STREQUAL STATIC)
+- install (TARGETS xmms2_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS xmms2_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (xmms2_mediaplayer STREQUAL STATIC)
+Index: modules/split_messages/CMakeLists.txt
+===================================================================
+--- modules/split_messages/CMakeLists.txt (wersja 6633)
++++ modules/split_messages/CMakeLists.txt (wersja 6634)
+@@ -43,4 +43,4 @@
+ endif (split_messages STREQUAL STATIC)
+ add_dependencies (split_messages split_messages-translations)
+
+-install (TARGETS split_messages DESTINATION lib/kadu/modules)
++install (TARGETS split_messages DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+Index: modules/antistring/CMakeLists.txt
+===================================================================
+--- modules/antistring/CMakeLists.txt (wersja 6633)
++++ modules/antistring/CMakeLists.txt (wersja 6634)
+@@ -46,6 +46,6 @@
+ if (APPLE)
+ set_target_properties(antistring PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS antistring DESTINATION lib/kadu/modules)
++ install (TARGETS antistring DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (antistring STREQUAL STATIC)
+
+Index: modules/profiles/CMakeLists.txt
+===================================================================
+--- modules/profiles/CMakeLists.txt (wersja 6633)
++++ modules/profiles/CMakeLists.txt (wersja 6634)
+@@ -36,6 +36,6 @@
+ if (APPLE)
+ set_target_properties(profiles PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS profiles DESTINATION lib/kadu/modules)
++ install (TARGETS profiles DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (profiles STREQUAL STATIC)
+
+Index: modules/config_wizard/CMakeLists.txt
+===================================================================
+--- modules/config_wizard/CMakeLists.txt (wersja 6633)
++++ modules/config_wizard/CMakeLists.txt (wersja 6634)
+@@ -55,6 +55,6 @@
+ if (APPLE)
+ set_target_properties(config_wizard PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS config_wizard DESTINATION lib/kadu/modules)
++ install (TARGETS config_wizard DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (config_wizard STREQUAL STATIC)
+
+Index: modules/dragon_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/dragon_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/dragon_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -20,5 +20,5 @@
+ if (dragon_mediaplayer STREQUAL STATIC)
+ set_target_properties(dragon_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (dragon_mediaplayer STREQUAL STATIC)
+- install (TARGETS dragon_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS dragon_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (dragon_mediaplayer STREQUAL STATIC)
+Index: modules/sound/CMakeLists.txt
+===================================================================
+--- modules/sound/CMakeLists.txt (wersja 6633)
++++ modules/sound/CMakeLists.txt (wersja 6634)
+@@ -59,7 +59,7 @@
+ if (APPLE)
+ set_target_properties(sound PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS sound DESTINATION lib/kadu/modules)
++ install (TARGETS sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (sound STREQUAL STATIC)
+
+
+Index: modules/macosx_docking/CMakeLists.txt
+===================================================================
+--- modules/macosx_docking/CMakeLists.txt (wersja 6633)
++++ modules/macosx_docking/CMakeLists.txt (wersja 6634)
+@@ -38,6 +38,6 @@
+ if (APPLE)
+ set_target_properties(macosx_docking PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS macosx_docking DESTINATION lib/kadu/modules)
++ install (TARGETS macosx_docking DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (macosx_docking STREQUAL STATIC)
+
+Index: modules/audacious_mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/audacious_mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/audacious_mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -20,5 +20,5 @@
+ if (audacious_mediaplayer STREQUAL STATIC)
+ set_target_properties(audacious_mediaplayer PROPERTIES COMPILE_FLAGS "-DKADULIB" )
+ else (audacious_mediaplayer STREQUAL STATIC)
+- install (TARGETS audacious_mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS audacious_mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (audacious_mediaplayer STREQUAL STATIC)
+Index: modules/encryption/CMakeLists.txt
+===================================================================
+--- modules/encryption/CMakeLists.txt (wersja 6633)
++++ modules/encryption/CMakeLists.txt (wersja 6634)
+@@ -61,6 +61,6 @@
+ if (APPLE)
+ set_target_properties(encryption PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS encryption DESTINATION lib/kadu/modules)
++ install (TARGETS encryption DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (encryption STREQUAL STATIC)
+
+Index: modules/autoaway/CMakeLists.txt
+===================================================================
+--- modules/autoaway/CMakeLists.txt (wersja 6633)
++++ modules/autoaway/CMakeLists.txt (wersja 6634)
+@@ -46,6 +46,6 @@
+ if (APPLE)
+ set_target_properties(autoaway PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS autoaway DESTINATION lib/kadu/modules)
++ install (TARGETS autoaway DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (autoaway STREQUAL STATIC)
+
+Index: modules/autoresponder/CMakeLists.txt
+===================================================================
+--- modules/autoresponder/CMakeLists.txt (wersja 6633)
++++ modules/autoresponder/CMakeLists.txt (wersja 6634)
+@@ -46,6 +46,6 @@
+ if (APPLE)
+ set_target_properties(autoresponder PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS autoresponder DESTINATION lib/kadu/modules)
++ install (TARGETS autoresponder DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (autoresponder STREQUAL STATIC)
+
+Index: modules/parser_extender/CMakeLists.txt
+===================================================================
+--- modules/parser_extender/CMakeLists.txt (wersja 6633)
++++ modules/parser_extender/CMakeLists.txt (wersja 6634)
+@@ -40,6 +40,6 @@
+ if (APPLE)
+ set_target_properties(parser_extender PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS parser_extender DESTINATION lib/kadu/modules)
++ install (TARGETS parser_extender DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (parser_extender STREQUAL STATIC)
+
+Index: modules/mediaplayer/CMakeLists.txt
+===================================================================
+--- modules/mediaplayer/CMakeLists.txt (wersja 6633)
++++ modules/mediaplayer/CMakeLists.txt (wersja 6634)
+@@ -76,6 +76,6 @@
+ if (APPLE)
+ set_target_properties(mediaplayer PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS mediaplayer DESTINATION lib/kadu/modules)
++ install (TARGETS mediaplayer DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (mediaplayer STREQUAL STATIC)
+
+Index: modules/voice/CMakeLists.txt
+===================================================================
+--- modules/voice/CMakeLists.txt (wersja 6633)
++++ modules/voice/CMakeLists.txt (wersja 6634)
+@@ -50,6 +50,6 @@
+ else (WIN32)
+ target_link_libraries(voice gsm)
+ endif (WIN32)
+- install (TARGETS voice DESTINATION lib/kadu/modules)
++ install (TARGETS voice DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (voice STREQUAL STATIC)
+
+Index: modules/default_sms/CMakeLists.txt
+===================================================================
+--- modules/default_sms/CMakeLists.txt (wersja 6633)
++++ modules/default_sms/CMakeLists.txt (wersja 6634)
+@@ -46,6 +46,6 @@
+ if (APPLE)
+ set_target_properties(default_sms PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS default_sms DESTINATION lib/kadu/modules)
++ install (TARGETS default_sms DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (default_sms STREQUAL STATIC)
+
+Index: modules/ext_sound/CMakeLists.txt
+===================================================================
+--- modules/ext_sound/CMakeLists.txt (wersja 6633)
++++ modules/ext_sound/CMakeLists.txt (wersja 6634)
+@@ -49,6 +49,6 @@
+ if (APPLE)
+ set_target_properties(ext_sound PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS ext_sound DESTINATION lib/kadu/modules)
++ install (TARGETS ext_sound DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (ext_sound STREQUAL STATIC)
+
+Index: modules/notify/CMakeLists.txt
+===================================================================
+--- modules/notify/CMakeLists.txt (wersja 6633)
++++ modules/notify/CMakeLists.txt (wersja 6634)
+@@ -57,6 +57,6 @@
+ if (APPLE)
+ set_target_properties(notify PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
+- install (TARGETS notify DESTINATION lib/kadu/modules)
++ install (TARGETS notify DESTINATION lib${LIB_SUFFIX}/kadu/modules)
+ endif (notify STREQUAL STATIC)
+
+Index: modules/last_seen/CMakeLists.txt
+===================================================================
+--- modules/last_seen/CMakeLists.txt (wersja 6633)
++++ modules/last_seen/CMakeLists.txt (wersja 6634)
+@@ -38,6 +38,6 @@
+ if (APPLE)
+ set_target_properties(last_seen PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif (APPLE)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.216&r2=1.217&f=u
More information about the pld-cvs-commit
mailing list