Hello community, here is the log from the commit of package vacuum-im for openSUSE:Factory checked in at 2018-01-03 13:39:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vacuum-im (Old) and /work/SRC/openSUSE:Factory/.vacuum-im.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacuum-im" Wed Jan 3 13:39:13 2018 rev:20 rq:555752 version:1.3.0+git1512173040.4b48e972 Changes: -------- --- /work/SRC/openSUSE:Factory/vacuum-im/vacuum-im.changes 2016-06-19 12:53:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vacuum-im.new/vacuum-im.changes 2018-01-03 13:39:15.832738543 +0100 @@ -1,0 +2,14 @@ +Sun Dec 10 17:33:08 UTC 2017 - [email protected] + +- Update RPM groups and summaries. + +------------------------------------------------------------------- +Sun Dec 3 11:00:15 UTC 2017 - [email protected] + +- plugin statistics moved to external package +- deleted fix_cmake_hunspell_found.pach: patch now don't need +- deleted fix_cmake_rules.patch: fixes submitted to upstream +- deleted vacuum-im-gcc6.patch +- added spellchecker plugin to standard plugins + +------------------------------------------------------------------- Old: ---- fix_cmake_rules.patch vacuum-im-1.2.5+rab1f3e3.tar.xz vacuum-im-gcc6.patch New: ---- vacuum-im-r4b48e972.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vacuum-im.spec ++++++ --- /var/tmp/diff_new_pack.rv9TX7/_old 2018-01-03 13:39:16.568493552 +0100 +++ /var/tmp/diff_new_pack.rv9TX7/_new 2018-01-03 13:39:16.572492221 +0100 @@ -1,7 +1,7 @@ # # spec file for package vacuum-im # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,49 +17,62 @@ %define sname vacuum -%define rtime 1433788363 -%define rhash ab1f3e3 +%define rtime 1512173040 +%define rhash 4b48e972 Name: %{sname}-im -Summary: Crossplatform Jabber client written on Qt +Version: 1.3.0+git%{rtime}.%{rhash} +Release: 0 +Summary: Jabber client written with Qt License: GPL-3.0 Group: Productivity/Networking/Instant Messenger -Version: 1.2.5 -Release: 0 -Source: %{name}-%{version}+r%{rhash}.tar.xz -# PATCH-FEATURE-UPSTREAM fix_cmake_rules.patch -Patch0: fix_cmake_rules.patch -# PATCH-FEATURE-UPSTREAM paranoia.patch +Url: http://www.vacuum-im.org/ +Source: %{name}-r%{rhash}.tar.xz +# PATCH-FEATURE-OPENSUSE paranoia.patch Patch1: paranoia.patch -# PATCH-FIX-OPENSUSE fix_default_smiles.patch +# PATCH-FEATURE-OPENSUSE fix_default_smiles.patch Patch2: fix_default_smiles.patch -# PATCH-FEATURE-UPSTREAM to resolve build time issue via gcc6 (bnc#985094). -Patch3: vacuum-im-gcc6.patch -Url: http://www.vacuum-im.org/ -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.0 BuildRequires: fdupes -BuildRequires: libQtWebKit-devel -BuildRequires: libqt4-devel +BuildRequires: hicolor-icon-theme +BuildRequires: hunspell-devel +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5Multimedia-devel +BuildRequires: libQt5X11Extras-devel +BuildRequires: libQt5Xml-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qttools-devel +BuildRequires: libqt5-qtx11extras-devel +#BuildRequires: qxtglobalshortcut-devel +BuildRequires: minizip-devel BuildRequires: openssl-devel +BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -BuildRequires: xz -Recommends: %{name}-plugins-spellchecker +BuildRequires: zlib-devel Recommends: %{name}-lang +Recommends: %{name}-plugins-spellchecker +%if 0%{?suse_version} > 1320 +BuildRequires: libXss-devel +%else +BuildRequires: libXScrnSaver-devel +%endif %description The core program is just a plugin loader - all functionality is made available via plugins. This enforces modularity and ensures well defined component interaction via interfaces. -%define libname libvacuumutils17 +%define libname libvacuumutils37 + %package -n %{libname} Summary: Shared library libvacuumutils for Vacuum-IM Group: System/Libraries +Conflicts: libvacuumutils1_7 %description -n %{libname} This package includes shared libraris needed to work Vacuum-IM program. %package devel -Summary: Development Files for Vacuum-IM +Summary: Development files for Vacuum-IM Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: %{name} = %{version} @@ -67,43 +80,55 @@ %description devel This package includes files needed to develop Vacuum-IM modules. +%package plugins-spellchecker +Summary: Vacuum-IM spellchecker plugin +Group: Productivity/Networking/Instant Messenger +Requires: %{libname} = %{version} +Requires: %{name} = %{version} + +%description plugins-spellchecker +Highlights words that may not be spelled correctly. + +%package plugins-statistics +Summary: Vacuum-IM application statistics collection plugin +Group: Productivity/Networking/Instant Messenger +Requires: %{libname} = %{version} +Requires: %{name} = %{version} + +%description plugins-statistics +This plugin needed to collect application statistics. + %lang_package %prep -%setup -q -n %{name} +%setup -q -n vacuum-im -%patch0 -p1 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -# fix shlib-policy-name-error -sed -i -e '/set(VERSION_UTILS_ABI/ s/[[:digit:]]*\.\([[:digit:]]*\)/\1/' config.cmake +%patch1 -p1 +%patch2 -p1 %build -%{__mkdir} build -cd build -cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo\ - -DGIT_DATE='%{rtime}'\ - -DGIT_HASH='%{rhash}'\ - -DINSTALL_SDK=1\ - -DCMAKE_INSTALL_PREFIX=%{_prefix}\ +%cmake \ + -DCMAKE_CXX_FLAGS="%{optflags} -std=c++0x"\ + -DGIT_DATE="%{rtime}"\ + -DGIT_HASH="%{rhash}"\ + -DINSTALL_SDK=ON\ -DINSTALL_APP_DIR=%{name}\ -DINSTALL_LIB_DIR=%{_lib}\ - -DINSTALL_DOC_DIR=%{_defaultdocdir} -%{__make} %{?_smp_mflags} + -DINSTALL_DOC_DIR=%{_defaultdocdir}\ + -DSPELLCHECKER_BACKEND=HUNSPELL\ + -DFORCE_BUNDLED_MINIZIP=OFF\ + -DNO_WEBKIT=ON\ + -DPLUGIN_adiummessagestyle=OFF +make %{?_smp_mflags} V=1 %install -pushd build -DESTDIR=%{buildroot} %{make_install} -popd -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo96.png %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo64.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo24.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png -%{__install} -D -m644 resources/menuicons/shared/mainwindowlogo16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -sed -i "s/Exec=%{sname}/Exec=%{name}/;s/Icon=%{sname}/Icon=%{name}/" %{buildroot}%{_datadir}/applications/%{sname}.desktop +%cmake_install + +for size in 16 24 32 48 64 96 128; do + install -Dpm 0644 resources/menuicons/shared/mainwindowlogo$size.png \ + %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png +done +sed -i "s/^Exec=.*$/Exec=%{name}/;s/^Icon=.*$/Icon=%{name}/" %{buildroot}%{_datadir}/applications/%{sname}.desktop mv %{buildroot}%{_datadir}/applications/%{sname}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop mv %{buildroot}%{_datadir}/pixmaps/%{sname}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png mv %{buildroot}%{_bindir}/%{sname} %{buildroot}%{_bindir}/%{name} @@ -111,8 +136,15 @@ %fdupes %{buildroot}%{_datadir} -%post -n %{libname} -p /sbin/ldconfig +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files @@ -121,11 +153,10 @@ %doc %{_defaultdocdir}/%{name} %{_bindir}/%{name} %{_libdir}/%{name} +%exclude %{_libdir}/%{name}/plugins/libspellchecker.so +%exclude %{_libdir}/%{name}/plugins/libstatistics.so %{_datadir}/%{name} -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/* -%dir %{_datadir}/icons/hicolor/*/apps -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -138,10 +169,17 @@ %{_libdir}/libvacuumutils.so %{_includedir}/%{name} +%files plugins-spellchecker +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/libspellchecker.so + +%files plugins-statistics +%defattr(-,root,root) +%{_libdir}/%{name}/plugins/libstatistics.so + %files lang %defattr(-,root,root) -%dir %{_datadir}/%{name}/translations -%dir %{_datadir}/%{name}/translations/* +%{_datadir}/%{name}/translations %lang(de) %{_datadir}/%{name}/translations/de/*.qm %lang(pl) %{_datadir}/%{name}/translations/pl/*.qm %lang(ru) %{_datadir}/%{name}/translations/ru/*.qm ++++++ fix_default_smiles.patch ++++++ --- /var/tmp/diff_new_pack.rv9TX7/_old 2018-01-03 13:39:16.596484232 +0100 +++ /var/tmp/diff_new_pack.rv9TX7/_new 2018-01-03 13:39:16.596484232 +0100 @@ -1,10 +1,10 @@ -Index: src/plugins/emoticons/emoticons.cpp +Index: vacuum-im/src/plugins/emoticons/emoticons.cpp =================================================================== ---- src/plugins/emoticons/emoticons.cpp (revision 1804) -+++ src/plugins/emoticons/emoticons.cpp (working copy) -@@ -5,7 +5,7 @@ - #include <QMimeData> - #include <QTextBlock> +--- vacuum-im/src/plugins/emoticons/emoticons.cpp (revision 2333) ++++ vacuum-im/src/plugins/emoticons/emoticons.cpp (working copy) +@@ -19,7 +19,7 @@ + #include <utils/logger.h> + #include <utils/menu.h> -#define DEFAULT_ICONSET "kolobok_dark" +#define DEFAULT_ICONSET "tasha" ++++++ paranoia.patch ++++++ --- /var/tmp/diff_new_pack.rv9TX7/_old 2018-01-03 13:39:16.608480237 +0100 +++ /var/tmp/diff_new_pack.rv9TX7/_new 2018-01-03 13:39:16.608480237 +0100 @@ -1,12 +1,12 @@ -Index: src/plugins/filemessagearchive/collectionwriter.cpp +Index: vacuum-im/src/plugins/filemessagearchive/filewriter.cpp =================================================================== ---- src/plugins/filemessagearchive/collectionwriter.cpp (revision 1854) -+++ src/plugins/filemessagearchive/collectionwriter.cpp (working copy) -@@ -22,6 +22,7 @@ +--- vacuum-im/src/plugins/filemessagearchive/filewriter.cpp (revision 2333) ++++ vacuum-im/src/plugins/filemessagearchive/filewriter.cpp (working copy) +@@ -33,6 +33,7 @@ FXmlFile = new QFile(FFileName,this); if (FXmlFile->open(QIODevice::WriteOnly|QIODevice::Truncate)) { -+ FXmlFile->setPermissions(QFile::ReadOwner|QFile::WriteOwner); ++ FXmlFile->setPermissions(QFile::ReadOwner|QFile::WriteOwner); FXmlWriter = new QXmlStreamWriter(FXmlFile); startCollection(); }
