Hello community, here is the log from the commit of package qutim for openSUSE:Factory checked in at 2013-12-24 16:05:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qutim (Old) and /work/SRC/openSUSE:Factory/.qutim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qutim" Changes: -------- --- /work/SRC/openSUSE:Factory/qutim/qutim.changes 2013-08-06 07:06:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qutim.new/qutim.changes 2013-12-24 16:05:46.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 28 00:06:51 UTC 2013 - [email protected] + +- Added fix-compilation-on-new-versions-of-cmake.patch, fixes build + with cmake >= 2.8.12 +- Added doxygen and libpurple-devel BuildRequires + +------------------------------------------------------------------- New: ---- fix-compilation-on-new-versions-of-cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qutim.spec ++++++ --- /var/tmp/diff_new_pack.eehKAE/_old 2013-12-24 16:05:47.000000000 +0100 +++ /var/tmp/diff_new_pack.eehKAE/_new 2013-12-24 16:05:47.000000000 +0100 @@ -23,6 +23,8 @@ Url: http://qutim.org/ Group: Productivity/Networking/Instant Messenger Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM fix-compilation-on-new-versions-of-cmake.patch -- fixes build with cmake 2.8.12 +Patch0: fix-compilation-on-new-versions-of-cmake.patch Requires: libjreen1 >= 1.1.0 Requires: libqca2-plugin-cyrus-sasl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,6 +37,8 @@ BuildRequires: libqca2-devel >= 2.0 BuildRequires: libqt4-devel >= 4.6 BuildRequires: phonon-devel +BuildRequires: doxygen +BuildRequires: libpurple-devel %if 0%{?suse_version} >= 1230 BuildRequires: libotr2-devel %else @@ -97,6 +101,9 @@ %prep %setup -q +%if %{suse_version} > 1310 +%patch0 -p1 +%endif %build LIBSUFFIX=$(echo "%{_lib}"|sed 's/^lib//') @@ -126,7 +133,9 @@ -DQRCICONS=0 \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ .. + make %{?_smp_flags} +#make popd #build %install @@ -176,6 +185,7 @@ %{_libdir}/qutim/plugins/libvkontakte.so %{_libdir}/qutim/plugins/libvkontaktewall.so %{_libdir}/qutim/plugins/libvphotoalbum.so +%{_libdir}/qutim/plugins/libquetzal.so #plugins %{_libdir}/qutim/plugins/libadiumwebview.so ++++++ fix-compilation-on-new-versions-of-cmake.patch ++++++ diff -Naur qutim-0.3.1.orig/core/cmake/QutIMMacros.cmake qutim-0.3.1/core/cmake/QutIMMacros.cmake --- qutim-0.3.1.orig/core/cmake/QutIMMacros.cmake 2012-04-13 18:51:50.000000000 +0200 +++ qutim-0.3.1/core/cmake/QutIMMacros.cmake 2013-12-23 23:13:44.790149133 +0100 @@ -52,7 +52,7 @@ FOREACH (_current_MOC_INC ${_match}) STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}") SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) - QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "") + QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "" "") MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc}) ENDFOREACH (_current_MOC_INC) ENDIF() @@ -62,7 +62,7 @@ STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}") IF(_match2) QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cxx outfile) - QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}") + QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}") SET(${outfiles} ${${outfiles}} ${outfile}) ENDIF() ENDIF() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
