diff --git a/.gitignore b/.gitignore index 78919f2..085a027 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,21 @@ vym-1.12.7.tar.bz2 /vym-2.4.8.tar.bz2 /vym-2.5.0.tar.bz2 /vym-2.5.4.tar.bz2 +/vym-2.5.19.tar.bz2 +/vym-2.5.21.tar.bz2 +/vym-2.6.0.tar.bz2 +/vym-2.6.2.tar.bz2 +/vym-2.6.3.tar.bz2 +/vym-2.6.5.tar.bz2 +/vym-2.6.8.tar.bz2 +/vym-2.6.11.tar.bz2 +/vym-2.7.0.tar.bz2 +/vym-2.7.1.tar.bz2 +/vym-2.7.557.tar.bz2 +/vym-2.7.562.tar.bz2 +/vym-2.8.0.tar.gz +/vym-2.8.8.tar.gz +/vym-2.9.0.tar.gz +/vym-2.9.22.tar.gz +/vym-2.9.26.tar.gz +/vym-3.0.0.tar.gz diff --git a/sources b/sources index 6fd7e0a..02e3c3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7589c61cc25eda23d511964d25e7ad77 vym-2.5.4.tar.bz2 +SHA512 (vym-3.0.0.tar.gz) = 46f098e87b5b14c479fbcdc1e69db5333bea97accc072add63d5c2cbce35f04d5ee2a07a12233f5e2363aad26dd8b758a6921f59b5187a15db59678f0cd8a2df diff --git a/vym-2.0.6-gcc470.patch b/vym-2.0.6-gcc470.patch deleted file mode 100644 index 9f90a62..0000000 --- a/vym-2.0.6-gcc470.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mainwindow.cpp~ 2011-12-14 12:18:36.000000000 -0600 -+++ mainwindow.cpp 2012-01-06 07:11:01.969955047 -0600 -@@ -4,6 +4,7 @@ - - #include - #include -+#include - - #include "aboutdialog.h" - #include "branchpropwindow.h" diff --git a/vym.spec b/vym.spec index f6a6871..d13aa1f 100644 --- a/vym.spec +++ b/vym.spec @@ -1,17 +1,14 @@ %global __requires_exclude .*BugzillaClient.* Name: vym -Version: 2.5.4 -Release: 1%{?dist} +Version: 3.0.0 +Release: 2%{?dist} Summary: View your mind -Group: Applications/Productivity -License: GPLv2+ -URL: http://www.insilmaril.de/vym/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# Currently obtained from OpenSUSE, SF releases to resume shortly -# http://download.opensuse.org/repositories/home://insilmaril/openSUSE_11.1/src/ -# See also BZ 511290 +License: GPL-2.0-or-later +URL: https://github.com/insilmaril/vym/ +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz + Source1: %{name}.desktop Source2: vym.xml Source3: vym-logo-new-16.png @@ -20,9 +17,16 @@ Source5: vym-logo-new-24.png Source6: vym-logo-new-32.png Source7: vym-logo-new-48.png Source8: vym-logo-new-256.png -#Patch0: vym-2.0.6-gcc470.patch -BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel libXext-devel desktop-file-utils +BuildRequires: make +BuildRequires: cmake +BuildRequires: libXext-devel +BuildRequires: desktop-file-utils +BuildRequires: dbus-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qttools-devel %{?filter_setup: %filter_from_requires /^perl(BugzillaClient)$/d @@ -42,23 +46,17 @@ to organize tasks, to get an overview over complex contexts. %prep %setup -q -#%patch0 -p0 - %build -%if (0%{?fedora} && 0%{?fedora} < 20) -%global docval %{_docdir}/%{name}-%{version} -%else %global docval %{_docdir} -%endif -%{qmake_qt5} DOCDIR="%{?docval}" PREFIX=%{_prefix} - -%{__make} %{?_smp_mflags} +%cmake -DCMAKE_INSTALL_DATAROOTDIR:PATH=share/vym +%cmake_build %install -%{__make} install INSTALL_ROOT=%{buildroot} COPY="%{__cp} -p -f" +mkdir -p %{buildroot}%{_datadir}/vym +%cmake_install %{__mkdir} -p %{buildroot}%{_datadir}/applications/ @@ -90,28 +88,10 @@ desktop-file-install \ install -m a+rx,u+w -d %{buildroot}%{_datadir}/mime/packages install -p -m a+r,u+w %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/vym.xml -mv %{buildroot}/usr/vym %{buildroot}%{_datadir}/vym - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-desktop-database &> /dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null - touch --no-create %{_datadir}/mime/packages &> /dev/null || : - update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi -update-desktop-database &> /dev/null || : - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -%doc LICENSE.txt README.md INSTALL.txt demos/* doc/* +%license LICENSE.txt +%doc README.md demos/* doc/* %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop @@ -125,6 +105,132 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Mon Jul 06 2026 Gwyn Ciesla - 3.0.0-1 +- 3.0.0 + +* Sat Jan 17 2026 Fedora Release Engineering - 2.9.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 2.9.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.9.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.9.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.9.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Gwyn Ciesla - 2.9.26-1 +- 2.9.26 + +* Tue Sep 05 2023 Gwyn Ciesla - 2.9.22-1 +- 2.9.22 + +* Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 24 2023 Gwyn Ciesla - 2.9.0-1 +- 2.9.0 + +* Fri Mar 03 2023 Gwyn Ciesla - 2.8.8-6 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 2.8.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.8.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.8.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 21 2021 Gwyn Ciesla - 2.8.8-1 +- 2.8.8 + +* Thu Apr 22 2021 Gwyn Ciesla - 2.8.0-2 +- Fix data installation. + +* Tue Apr 20 2021 Gwyn Ciesla - 2.8.0-1 +- 2.8.0 + +* Mon Mar 01 2021 Gwyn Ciesla - 2.7.562-1 +- 2.7.562 + +* Tue Feb 09 2021 Gwyn Ciesla - 2.7.557-1 +- 2.7.557 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 14 2019 Gwyn Ciesla - 2.7.1-1 +- 2.7.1 + +* Mon Apr 15 2019 Gwyn Ciesla - 2.7.0-1 +- 2.7.0. + +* Sun Feb 03 2019 Fedora Release Engineering - 2.6.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.6.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.6.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Nov 15 2017 Gwyn Ciesla - 2.6.11-1 +- 2.6.11 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.6.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.6.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 07 2017 Igor Gnatenko - 2.6.8-2 +- Rebuild due to bug in RPM (RHBZ #1468476) + +* Mon Mar 20 2017 Gwyn Ciesla - 2.6.8-1 +- Latest upstream, BZ 1433812. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.6.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 03 2017 Jon Ciesla - 2.6.5-1 +- Latest upstream, BZ 1409680. + +* Fri Dec 30 2016 Jon Ciesla - 2.6.3-1 +- Latest upstream, BZ 1409171. + +* Thu Oct 27 2016 Jon Ciesla - 2.6.2-1 +- Latest upstream. + +* Thu Sep 15 2016 Jon Ciesla - 2.6.0-1 +- Latest upstream. + +* Wed Aug 17 2016 Jon Ciesla - 2.5.21-1 +- Latest upstream. + +* Mon Jul 25 2016 Jon Ciesla - 2.5.19-1 +- Latest upstream, BZ 1359465. + * Tue Feb 23 2016 Jon Ciesla - 2.5.4-1 - Latest upstream, BZ 1310923.