commit qutim for openSUSE:Factory

Hello community, here is the log from the commit of package qutim for openSUSE:Factory checked in at 2014-07-31 10:04:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-24 16:05:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qutim.new/qutim.changes 2014-07-31 10:04:36.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Feb 23 08:23:47 UTC 2014 - dap.darkness@gmail.com + +- Version 0.3.2: + * no upstream changelog. +- clean section was removed. +- Deleted fix-compilation-on-new-versions-of-cmake.patch, + as merged into upstream (or smth like this). +- Added patch use_automoc_for_kdeintegration.diff to resolve + build issues for openSUSE versions higher than 13.1 +------------------------------------------------------------------- Old: ---- fix-compilation-on-new-versions-of-cmake.patch qutim-0.3.1.tar.bz2 New: ---- qutim-0.3.2.tar.xz use_automoc_for_kdeintegration.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qutim.spec ++++++ --- /var/tmp/diff_new_pack.EbweQJ/_old 2014-07-31 10:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.EbweQJ/_new 2014-07-31 10:04:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qutim # -# Copyright (c) 2012 Sergei Lopatin <magist3r@gmail.com> +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,16 @@ # Name: qutim -Version: 0.3.1 +Version: 0.3.2 Release: 1.0 License: GPL-3.0+ Summary: QutIM instant messenger 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 +Source: http://qutim.org/dwnl/68/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE set AUTOMOC for the KDEINTEGRATION plugin -- fixes build with cmake 2.8.12 +# Also remove the uninstall part from CMakeLists.txt in QtDockTile as this conflicts with kdeintegration plugin +Patch0: use_automoc_for_kdeintegration.diff Requires: libjreen1 >= 1.1.0 Requires: libqca2-plugin-cyrus-sasl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +37,7 @@ BuildRequires: libjreen-devel >= 1.1.0 BuildRequires: libqca2-devel >= 2.0 BuildRequires: libqt4-devel >= 4.6 +BuildRequires: libqxt-devel BuildRequires: phonon-devel BuildRequires: doxygen BuildRequires: libpurple-devel @@ -135,7 +137,6 @@ .. make %{?_smp_flags} -#make popd #build %install @@ -145,7 +146,7 @@ popd #build # Link duplicate files -%fdupes %{buildroot}/%{_datadir}/apps +%fdupes %{buildroot}/%{_datadir} %post /sbin/ldconfig @@ -153,9 +154,6 @@ %postun /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %dir %{_libdir}/qutim @@ -168,8 +166,8 @@ %{_datadir}/applications/%{name}.desktop #lib -%{_libdir}/libqutim.so.* -%{_libdir}/libqutim-adiumwebview.so.* +%{_libdir}/libqutim*.so.* +%{_libdir}/libvreen.so.* #app icons %{_datadir}/icons/* @@ -183,8 +181,6 @@ %{_libdir}/qutim/plugins/liboscaridentify.so %{_libdir}/qutim/plugins/liboscarxstatus.so %{_libdir}/qutim/plugins/libvkontakte.so -%{_libdir}/qutim/plugins/libvkontaktewall.so -%{_libdir}/qutim/plugins/libvphotoalbum.so %{_libdir}/qutim/plugins/libquetzal.so #plugins @@ -194,14 +190,19 @@ %{_libdir}/qutim/plugins/libadiumchat.so %{_libdir}/qutim/plugins/libadiumsrvicons.so %{_libdir}/qutim/plugins/libauthdialog.so +%{_libdir}/qutim/plugins/libautopaster.so +%{_libdir}/qutim/plugins/libautoreply.so %{_libdir}/qutim/plugins/libbearermanager.so %{_libdir}/qutim/plugins/libchatnotificationsbackend.so %{_libdir}/qutim/plugins/libchatspellchecker.so %{_libdir}/qutim/plugins/libcontactinfo.so +%{_libdir}/qutim/plugins/libcomparators.so +%{_libdir}/qutim/plugins/libcontactmodel.so %{_libdir}/qutim/plugins/libdataformsbackend.so %{_libdir}/qutim/plugins/libemoticonssettings.so %{_libdir}/qutim/plugins/libfiletransfer.so %{_libdir}/qutim/plugins/libfiletransfersettings.so +%{_libdir}/qutim/plugins/libformula.so %{_libdir}/qutim/plugins/libidledetector.so %{_libdir}/qutim/plugins/libidlestatuschanger.so %{_libdir}/qutim/plugins/libjoinchatdialog.so @@ -218,14 +219,13 @@ %{_libdir}/qutim/plugins/libmobilenotificationssettings.so %{_libdir}/qutim/plugins/liboldsoundtheme.so %{_libdir}/qutim/plugins/libpassword.so -%{_libdir}/qutim/plugins/libplaincontactsmodel.so %{_libdir}/qutim/plugins/libplistconfig.so %{_libdir}/qutim/plugins/libproxysettings.so %{_libdir}/qutim/plugins/libqticons.so %{_libdir}/qutim/plugins/libsearchdialog.so %{_libdir}/qutim/plugins/libservicechooser.so %{_libdir}/qutim/plugins/libsessionhelper.so -%{_libdir}/qutim/plugins/libseparatedcontactsmodel.so +%{_libdir}/qutim/plugins/libscreenshoter.so %{_libdir}/qutim/plugins/libshortcutsettings.so %{_libdir}/qutim/plugins/libsimpleaboutdialog.so %{_libdir}/qutim/plugins/libsimpleactionbox.so @@ -240,11 +240,9 @@ %{_libdir}/qutim/plugins/libtextchat.so %{_libdir}/qutim/plugins/libtorycontactlistwidget.so %{_libdir}/qutim/plugins/libtrayicon.so -%{_libdir}/qutim/plugins/libtreecontactsmodel.so %{_libdir}/qutim/plugins/libxsettingsdialog.so %{_libdir}/qutim/plugins/liblinuxintegration.so %{_libdir}/qutim/plugins/libphononsound.so - %{_libdir}/qutim/plugins/libaescrypto.so %{_libdir}/qutim/plugins/libantispam.so %{_libdir}/qutim/plugins/libbirthdayreminder.so @@ -271,8 +269,8 @@ %files devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/libqutim.so -%{_libdir}/libqutim-adiumwebview.so +%{_libdir}/libqutim*.so +%{_libdir}/libvreen*.so %{_datadir}/cmake/Modules %files plugin-aspeller ++++++ use_automoc_for_kdeintegration.diff ++++++ diff -urB qutim-0.3.2/plugins/docktile/qtdocktile/CMakeLists.txt new/plugins/docktile/qtdocktile/CMakeLists.txt --- qutim-0.3.2/plugins/docktile/qtdocktile/CMakeLists.txt 2013-09-09 21:26:25.000000000 +0200 +++ new/plugins/docktile/qtdocktile/CMakeLists.txt 2014-02-23 17:43:37.309856956 +0100 @@ -36,12 +36,3 @@ endif() #add_subdirectory(doc) -if(NOT UNINSTALL_TARGET) - configure_file( - "${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake") - set(UNINSTALL_TARGET true GLOBAL) -endif() diff -urB qutim-0.3.2/plugins/kdeintegration/CMakeLists.txt new/plugins/kdeintegration/CMakeLists.txt --- qutim-0.3.2/plugins/kdeintegration/CMakeLists.txt 2014-02-17 17:36:36.000000000 +0100 +++ new/plugins/kdeintegration/CMakeLists.txt 2014-02-23 18:30:50.637122852 +0100 @@ -8,6 +8,8 @@ include(KDE4Defaults) +set(CMAKE_AUTOMOC true) + add_definitions( ${KDE4_DEFINITIONS} ) qutim_add_plugin(kdeintegration -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de