From 61e6ba037cc46189a332d326915c3a83c8cbf7e01e407985aba5219c4775138c Mon Sep 17 00:00:00 2001 From: Uwe Drechsel Date: Thu, 8 Sep 2022 12:53:14 +0000 Subject: [PATCH] Update to upstream version 2.8.41 OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=58 --- debian.changelog | 62 +++++++++++++++++++++++++++++++++++- debian.compat | 1 + debian.control | 2 +- debian.rules | 9 +++--- makedist.config | 7 +++-- vym-2.8.41.tar.bz2 | 3 ++ vym-2.8.8.tar.bz2 | 3 -- vym.changes | 7 +++++ vym.desktop | 41 ------------------------ vym.dsc | 13 ++++++-- vym.spec | 78 ++++++++++++++++++++++++---------------------- vym.xml | 9 ------ x-vym.desktop | 7 ----- 13 files changed, 133 insertions(+), 109 deletions(-) create mode 100644 debian.compat create mode 100644 vym-2.8.41.tar.bz2 delete mode 100644 vym-2.8.8.tar.bz2 delete mode 100644 vym.desktop delete mode 100644 vym.xml delete mode 100644 x-vym.desktop diff --git a/debian.changelog b/debian.changelog index e15e04e..2ce7f4c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,8 +1,68 @@ +vym (2.8.27.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Fri, 31 Dec 2021 18:14:00 +0100 + +vym (2.8.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 30 Apr 2021 18:14:00 +0100 + +vym (2.7.570.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 14 May 2019 17:14:00 +0100 + +vym (2.7.1.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 14 May 2019 17:14:00 +0100 + +vym (2.7.0.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 15 Apr 2019 10:44:00 +0100 + +vym (2.6.11.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 14 Nov 2017 13:15:00 +0100 + +vym (2.6.8.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Sun, 19 Mar 2017 18:15:00 +0100 + +vym (2.6.7.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Tue, 24 Jan 2017 12:15:00 +0100 + +vym (2.6.3.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Thu, 29 Oct 2016 07:15:00 +0100 + +vym (2.6.2.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Thu, 27 Oct 2016 07:15:00 +0100 + vym (2.6.0.1) unstable; urgency=low * New upstream release - -- Uwe Drechsel Sat, 17 Aug 2016 13:04:00 +0100 + -- Uwe Drechsel Thu, 15 Aug 2016 07:15:00 +0100 vym (2.5.22.1) unstable; urgency=low diff --git a/debian.compat b/debian.compat new file mode 100644 index 0000000..16e17dc --- /dev/null +++ b/debian.compat @@ -0,0 +1 @@ +9 \ No newline at end of file diff --git a/debian.control b/debian.control index 93915e1..175ba36 100644 --- a/debian.control +++ b/debian.control @@ -2,7 +2,7 @@ Source: vym Section: sectionName Priority: optional Maintainer: Uwe Drechsel -Build-Depends: debhelper (>= 4.1.16) +Build-Depends: cmake, debhelper (>= 9) Package: vym Architecture: any diff --git a/debian.rules b/debian.rules index be62643..292122c 100644 --- a/debian.rules +++ b/debian.rules @@ -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 @@ build-stamp: 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 @@ install: build # Add here commands to install the package # The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/ - 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. diff --git a/makedist.config b/makedist.config index 1d7d2e6..18de647 100644 --- a/makedist.config +++ b/makedist.config @@ -1,3 +1,4 @@ -VERSION=2.5.21 -BRANCH="qt5" -REMOTE="sf" +#TAG=v2.8.8 +BRANCH="develop" +#VERSION=2.8.8 +REPOSITORY=git@github.com:insilmaril/vym.git diff --git a/vym-2.8.41.tar.bz2 b/vym-2.8.41.tar.bz2 new file mode 100644 index 0000000..4d61406 --- /dev/null +++ b/vym-2.8.41.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58a7449f656e318a27f27a124a85feabbaccffc15927a8069d1381bfc20566d8 +size 16931329 diff --git a/vym-2.8.8.tar.bz2 b/vym-2.8.8.tar.bz2 deleted file mode 100644 index 5086785..0000000 --- a/vym-2.8.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:405b6d58ea4a201e7aa32f2b65c61d3bec50f914486d02394842bdd7f8f41f08 -size 8142944 diff --git a/vym.changes b/vym.changes index bc5a4a4..0595d9f 100644 --- a/vym.changes +++ b/vym.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 8 12:09:50 UTC 2022 - Uwe Drechsel + +- Update to upstream version 2.8.41 +- bugfixes, some features +- switch to cmake + ------------------------------------------------------------------- Tue Aug 17 09:29:43 UTC 2021 - Uwe Drechsel diff --git a/vym.desktop b/vym.desktop deleted file mode 100644 index 7806bb0..0000000 --- a/vym.desktop +++ /dev/null @@ -1,41 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Exec=vym -Name=VYM - View Your Mind -Name[de]=VYM - View Your Mind -Name[zh_TW]=心智檢視 -GenericName=Planning and Brainstorming Tool -Icon=vym.png -MimeType=application/x-vym; -Comment=Planning and brainstorming -Comment[af]=View Your Mind (Besigitig jou verstand) -Comment[sq]=View Your Mind (Shfaq Mendjen Tënde) -Comment[ast]=View Your Mind (Ve la to miente) -Comment[bn]=View Your Mind (আপনার উদ্দেশ্য প্রদর্শন করুন) -Comment[bs]=View Your Mind (Pogledajte svoje misli) -Comment[ca@valencia]=View Your Mind (Visualitzeu la vostra ment) -Comment[ca]=View Your Mind (Visualitzeu la vostra ment) -Comment[zh_CN]=View Your Mind (浏览您的思维) -Comment[da]=View Your Mind (Vis dit sind) -Comment[et]=View Your Mind (Vaata oma mõtteid) -Comment[fi]=View Your Mind (Näytä mielesi) -Comment[fr]=View Your Mind (Cartographier vos idées) -Comment[gl]=View Your Mind (Vexa a súa mente) -Comment[ky]=View Your Mind (Акылыңды иштетип көр) -Comment[oc]=View Your Mind (Cartografiar vòstras idèas) -Comment[pl]=View Your Mind (Uzewnętrznia myśli) -Comment[ro]=View Your Mind (Hărți mentale) -Comment[ru]=View Your Mind (Просмотр ваших мыслей) -Comment[sl]=View Your Mind (Oglejte si svoje misli) -Comment[es]=View Your Mind (Vea su mente) -Comment[vi]=View Your Mind (Xem tư duy của bạn) -Comment[zh_TW]=VYM 腦力激盪工具 - -X-AppInstall-Package=vym -X-AppInstall-Popcon=430 -X-AppInstall-Section=universe -X-Ubuntu-Gettext-Domain=app-install-data -Categories=Qt;KDE;Office; - - diff --git a/vym.dsc b/vym.dsc index 0925b9d..8d3762f 100644 --- a/vym.dsc +++ b/vym.dsc @@ -1,9 +1,18 @@ Format: 1.0 Source: vym -Version: 2.4.0 +Version: 2.8.27 Binary: vym Maintainer: Uwe Drechsel 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 end of file diff --git a/vym.spec b/vym.spec index 0ad1aaf..97b21fd 100644 --- a/vym.spec +++ b/vym.spec @@ -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 @@ overview over complex contexts, to sort ideas etc. %setup -q %build -lrelease-qt5 vym.pro -qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE -make %{?_smp_mflags} +%global cmake_options \\\ + -DCMAKE_INSTALL_DATAROOTDIR="share/vym" \\\ + -DCMAKE_INSTALL_MANDIR="%{_mandir}/man1" \\\ + -DCMAKE_INSTALL_DOCDIR="%{_defaultdocdir}/%{name}" + +%cmake %{cmake_options} +%cmake_build %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} +%cmake_install -mkdir -p %{buildroot}%{_datadir}/applications -install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/applications - -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 0644 doc/vym.1.gz %{buildroot}%{_mandir}/man1 - -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 @@ fi %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 diff --git a/vym.xml b/vym.xml deleted file mode 100644 index bda5338..0000000 --- a/vym.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - VYM - View Your Mind files - - - - - diff --git a/x-vym.desktop b/x-vym.desktop deleted file mode 100644 index cf805d1..0000000 --- a/x-vym.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Comment=VYM (View Your Mind) File -Type=MimeType -MimeType=application/x-vym -Icon=vym -Patterns=*.vym;*.vyp;*.vys;*.VYM;*.VYP;*.VYS;