Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vym for openSUSE:Factory checked in at 2022-09-15 23:00:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vym (Old) and /work/SRC/openSUSE:Factory/.vym.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vym" Thu Sep 15 23:00:01 2022 rev:46 rq:1003859 version:2.8.41 Changes: -------- --- /work/SRC/openSUSE:Factory/vym/vym.changes 2021-08-18 08:57:03.086894513 +0200 +++ /work/SRC/openSUSE:Factory/.vym.new.2083/vym.changes 2022-09-15 23:01:16.165567583 +0200 @@ -1,0 +2,7 @@ +Thu Sep 8 12:09:50 UTC 2022 - Uwe Drechsel <v...@insilmaril.de> + +- Update to upstream version 2.8.41 +- bugfixes, some features +- switch to cmake + +------------------------------------------------------------------- Old: ---- vym-2.8.8.tar.bz2 vym.desktop vym.xml x-vym.desktop New: ---- debian.compat vym-2.8.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vym.spec ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.685569052 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.689569062 +0200 @@ -1,7 +1,7 @@ # # spec file for package vym # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,30 +17,31 @@ Name: vym -Version: 2.8.8 +Version: 2.8.41 Release: 0 Summary: Tool to generate and manipulate thought maps License: GPL-2.0-only Group: Productivity/Office/Other URL: http://www.insilmaril.de/vym/index.html Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}.xml -Source2: %{name}.desktop -Source3: x-%{name}.desktop -Source4: debian.dirs -Source5: debian.docs -Source6: makedist.config -%if 0%{?fedora_version} -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qttools-devel -%else -BuildRequires: libQt5Core-devel -BuildRequires: libQt5Gui-devel -BuildRequires: libqt5-linguist-devel -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtscript-devel -BuildRequires: libqt5-qtsvg-devel +Source1: debian.dirs +Source2: debian.docs +Source3: makedist.config + +BuildRequires: cmake +BuildRequires: pkgconfig +BuildRequires: pkgconfig(dbus-1) + +BuildRequires: cmake(Qt5Core) >= 5.15.2 +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Xml) + +%if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -58,28 +59,24 @@ %setup -q %build -lrelease-qt5 vym.pro -qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE -make %{?_smp_mflags} - -%install -mkdir -p %{buildroot}%{_datadir}/vym -mkdir -p %{buildroot}%{_datadir}/pixmaps -install -m 0644 icons/vym.png %{buildroot}%{_datadir}/pixmaps -mkdir -p %{buildroot}%{_defaultdocdir}/%{name} -install -m 0644 README.md LICENSE.txt %{buildroot}%{_defaultdocdir}/%{name} -install -m 0644 doc/*.pdf %{buildroot}%{_defaultdocdir}/%{name} -make %{?_smp_mflags} DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot} +%global cmake_options \\\ + -DCMAKE_INSTALL_DATAROOTDIR="share/vym" \\\ + -DCMAKE_INSTALL_MANDIR="%{_mandir}/man1" \\\ + -DCMAKE_INSTALL_DOCDIR="%{_defaultdocdir}/%{name}" -mkdir -p %{buildroot}%{_datadir}/applications -install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/applications +%cmake %{cmake_options} +%cmake_build -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 0644 doc/vym.1.gz %{buildroot}%{_mandir}/man1 +%install +%cmake_install -mkdir -p %{buildroot}%{_datadir}/mime/packages -install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/mime/packages/ +%if 0%{?suse_version} %suse_update_desktop_file -i vym Office ProjectManagement +%endif + +# Make scripts executable already installed with cmake above +chmod 755 %{buildroot}%{_datadir}/%{name}/scripts/vivym +chmod 755 %{buildroot}%{_datadir}/%{name}/scripts/vym-addmail.rb %post if test -x usr/bin/update-mime-database ; then @@ -89,7 +86,12 @@ %files %defattr(-,root,root) %{_datadir}/applications/* -%{_datadir}/pixmaps/* + +# Directories can be owned by multiple packages: +%dir %{_datadir}/icons/hicolor/48x48 +%dir %{_datadir}/icons/hicolor/48x48/apps + +%{_datadir}/icons/*/*/*/*.* %{_bindir}/vym %{_datadir}/vym ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.729569175 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.733569187 +0200 @@ -1,8 +1,68 @@ +vym (2.8.27.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Fri, 31 Dec 2021 18:14:00 +0100 + +vym (2.8.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Tue, 30 Apr 2021 18:14:00 +0100 + +vym (2.7.570.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Tue, 14 May 2019 17:14:00 +0100 + +vym (2.7.1.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Tue, 14 May 2019 17:14:00 +0100 + +vym (2.7.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Mon, 15 Apr 2019 10:44:00 +0100 + +vym (2.6.11.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Tue, 14 Nov 2017 13:15:00 +0100 + +vym (2.6.8.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Sun, 19 Mar 2017 18:15:00 +0100 + +vym (2.6.7.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Tue, 24 Jan 2017 12:15:00 +0100 + +vym (2.6.3.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Thu, 29 Oct 2016 07:15:00 +0100 + +vym (2.6.2.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel <v...@insilmaril.de> Thu, 27 Oct 2016 07:15:00 +0100 + vym (2.6.0.1) unstable; urgency=low * New upstream release - -- Uwe Drechsel <v...@insilmaril.de> Sat, 17 Aug 2016 13:04:00 +0100 + -- Uwe Drechsel <v...@insilmaril.de> Thu, 15 Aug 2016 07:15:00 +0100 vym (2.5.22.1) unstable; urgency=low ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.757569254 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.761569266 +0200 @@ -2,7 +2,7 @@ Section: sectionName Priority: optional Maintainer: Uwe Drechsel <v...@insilmaril.de> -Build-Depends: debhelper (>= 4.1.16) +Build-Depends: cmake, debhelper (>= 9) Package: vym Architecture: any ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.793569356 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.797569367 +0200 @@ -6,7 +6,9 @@ export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=4 +#export DH_COMPAT=4 + +export QT_SELECT := qt5 CFLAGS = -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -20,8 +22,7 @@ dh_testdir # Add here commands to compile the package. - #qmake -o Makefile vym.pro PREFIX=/usr/src/packages/BUILD/debian/vym CONFIG+=RELEASE PREFIX=/usr/src/packages/BUILD/debian/vym/usr - qmake -o Makefile vym.pro CONFIG+=RELEASE PREFIX=/usr/src/packages/BUILD/debian/vym/usr + cmake . -DCMAKE_INSTALL_DATAROOTDIR="share/vym" -DCMAKE_INSTALL_MANDIR="share/man/man1" -DCMAKE_INSTALL_DOCDIR="share/vym" make lrelease vym.pro # --- end custom part for compiling @@ -51,7 +52,7 @@ # Add here commands to install the package # The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage> - make install PREFIX=/usr/src/packages/BUILD/debian/vym/usr + make install DESTDIR=/usr/src/packages/BUILD/debian/vym # --- end custom part for installing # Build architecture-independent files here. ++++++ makedist.config ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.817569424 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.821569435 +0200 @@ -1,4 +1,5 @@ -VERSION=2.5.21 -BRANCH="qt5" -REMOTE="sf" +#TAG=v2.8.8 +BRANCH="develop" +#VERSION=2.8.8 +REPOSITORY=g...@github.com:insilmaril/vym.git ++++++ vym-2.8.8.tar.bz2 -> vym-2.8.41.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/vym/vym-2.8.8.tar.bz2 /work/SRC/openSUSE:Factory/.vym.new.2083/vym-2.8.41.tar.bz2 differ: char 11, line 1 ++++++ vym.dsc ++++++ --- /var/tmp/diff_new_pack.Lrq2Lx/_old 2022-09-15 23:01:16.857569537 +0200 +++ /var/tmp/diff_new_pack.Lrq2Lx/_new 2022-09-15 23:01:16.861569548 +0200 @@ -1,10 +1,19 @@ Format: 1.0 Source: vym -Version: 2.4.0 +Version: 2.8.27 Binary: vym Maintainer: Uwe Drechsel <v...@insilmaril.de> Architecture: any -Build-Depends: debhelper (>= 4.1.16),g++, libqt5-dev +Build-Depends: cmake, + debhelper (>= 9), + g++, + qtbase5-dev, + qttools5-dev-tools, + qttools5-dev, + qtscript5-dev, + libqt5svg5-dev, + libdbus-1-dev, + libqt5dbus5 Files: 4116086282d260056458a8b96b2d5459 20171606 vym-1.13.32.tar.bz2 (No newline at EOF)
