Hello community, here is the log from the commit of package kadu for openSUSE:Factory checked in at 2013-12-03 14:26:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kadu (Old) and /work/SRC/openSUSE:Factory/.kadu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kadu" Changes: -------- --- /work/SRC/openSUSE:Factory/kadu/kadu.changes 2012-11-06 16:07:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kadu.new/kadu.changes 2013-12-03 14:26:10.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Dec 2 14:36:59 UTC 2013 - [email protected] + +- Add kadu-0.12.3-cmake-macro-fix.patch: Fix cmake macro usage in + openSUSE > 13.1. + +------------------------------------------------------------------- +Fri Nov 22 12:32:40 UTC 2013 - [email protected] + +- Don't build against libntrack for openSUSE >= 13.1. Fix bnc#851159. + +------------------------------------------------------------------- New: ---- kadu-0.12.3-cmake-macro-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kadu.spec ++++++ --- /var/tmp/diff_new_pack.hVh8b3/_old 2013-12-03 14:26:11.000000000 +0100 +++ /var/tmp/diff_new_pack.hVh8b3/_new 2013-12-03 14:26:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kadu # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Mariusz Fik <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -31,6 +31,10 @@ Source0: http://download.kadu.im/stable/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE enable_external_plugins.patch [email protected] Patch0: enable_external_plugins.patch +%if %{?suse_version} > 1310 +# PATCH-FIX-UPSTREAM kadu-0.12.3-cmake-macro-fix.patch -- http://www.kadu.im/forum/viewtopic.php?f=1&t=16904#p112935 +Patch1: kadu-0.12.3-cmake-macro-fix.patch +%endif ### 1x - External Plugins ### Source10: http://download.kadu.im/external-plugins/anonymous_check/anonymous_check-0.11.0-1.tar.bz2 Source11: http://ultr.pl/kadu/globalhotkeys-0.12-32.tar.gz @@ -64,7 +68,7 @@ BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(libgadu) >= 1.11.0 BuildRequires: pkgconfig(libidn) -%if %{?suse_version} > 1140 +%if %{?suse_version} < 1310 BuildRequires: pkgconfig(libntrack-qt4) %endif BuildRequires: pkgconfig(phonon) @@ -301,6 +305,10 @@ # networkping, nextinfo, panelkadu, senthistory # %patch0 +# Fix cmake macro only for > 13.1 +%if %{?suse_version} > 1310 +%patch1 -p0 +%endif # switch state of internal plugins # don't enable mpd since it's not in oss repository ++++++ kadu-0.12.3-cmake-macro-fix.patch ++++++ Index: plugins/jabber_protocol/3rdparty/CMakeLists.txt =================================================================== --- plugins/jabber_protocol/3rdparty/CMakeLists.txt.orig +++ plugins/jabber_protocol/3rdparty/CMakeLists.txt @@ -26,7 +26,7 @@ macro (kadu_jabber_automoc) get_filename_component (_basename ${_current_MOC} NAME_WE) set (_header ${_abs_FILE}) set (_moc ${_abs_PATH}/${_current_MOC}) - QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "") + QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}") MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc}) endforeach (_current_MOC_INC) endif (_match) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
