diff --git a/.gitignore b/.gitignore index 46f98c0..1f512ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/*.src.rpm /umbrello-17.08.1.tar.xz /umbrello-17.08.3.tar.xz /umbrello-17.12.0.tar.xz @@ -44,3 +45,64 @@ /umbrello-22.04.0.tar.xz /umbrello-22.04.1.tar.xz /umbrello-22.04.1.tar.xz +/umbrello-22.04.3.tar.xz +/umbrello-22.08.0.tar.xz +/umbrello-22.08.1.tar.xz +/umbrello-22.08.2.tar.xz +/umbrello-22.08.3.tar.xz +/umbrello-22.12.0.tar.xz +/umbrello-22.12.1.tar.xz +/umbrello-22.12.2.tar.xz +/umbrello-22.12.3.tar.xz +/umbrello-23.03.80.tar.xz +/umbrello-23.03.90.tar.xz +/umbrello-23.04.0.tar.xz +/umbrello-23.04.1.tar.xz +/umbrello-23.04.2.tar.xz +/umbrello-23.04.3.tar.xz +/umbrello-23.08.0.tar.xz +/umbrello-23.08.1.tar.xz +/umbrello-23.08.2.tar.xz +/umbrello-24.01.85.tar.xz +/umbrello-24.01.90.tar.xz +/umbrello-24.01.95.tar.xz +/umbrello-24.02.0.tar.xz +/umbrello-24.02.1.tar.xz +/umbrello-24.02.2.tar.xz +/umbrello-24.05.0.tar.xz +/umbrello-24.05.1.tar.xz +/umbrello-24.05.2.tar.xz +/umbrello-24.08.0.tar.xz +/umbrello-24.08.1.tar.xz +/umbrello-24.08.2.tar.xz +/umbrello-24.08.3.tar.xz +/umbrello-24.11.80.tar.xz +/umbrello-24.11.90.tar.xz +/umbrello-24.12.0.tar.xz +/umbrello-24.12.1.tar.xz +/umbrello-24.12.2.tar.xz +/umbrello-24.12.3.tar.xz +/umbrello-25.03.80.tar.xz +/umbrello-25.04.0.tar.xz +/umbrello-25.04.1.tar.xz +/umbrello-25.04.2.tar.xz +/umbrello-25.04.3.tar.xz +/umbrello-25.07.80.tar.xz +/umbrello-25.07.90.tar.xz +/umbrello-25.08.0.tar.xz +/umbrello-25.08.1.tar.xz +/umbrello-25.08.2.tar.xz +/umbrello-25.08.3.tar.xz +/umbrello-25.11.80.tar.xz +/umbrello-25.11.90.tar.xz +/umbrello-25.12.0.tar.xz +/umbrello-25.12.1.tar.xz +/umbrello-25.12.2.tar.xz +/umbrello-25.12.3.tar.xz +/umbrello-26.03.80.tar.xz +/umbrello-26.04.0.tar.xz +/umbrello-26.04.1.tar.xz +/umbrello-26.04.2.tar.xz +/umbrello-26.04.3.tar.xz +/umbrello-26.07.90.tar.xz +/umbrello-26.08.0.tar.xz diff --git a/sources b/sources index 39d90f5..80e57a3 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (umbrello-21.12.3.tar.xz) = 2f24373a41a82bab5fec6a548f18131a70066b5a8ebcadb48aba765e81712c2bb8c4e5017bcfdb4062795ac899d42e3529bd7fbbf1bad403ab2cb0654d727296 -SHA512 (umbrello-22.04.0.tar.xz) = a029fe5f1b83eeb495d5368135a189e6e904c8241d093f5a861cedd8aba5dd79016e739abc22464d71fe60e001cd1d0483f4e093631a07cb9e64f3eb9f7e7240 -SHA512 (umbrello-22.04.1.tar.xz) = c58051d1e0c8bcedb824e2c582292452fa27743446da7666690ddbbdf5be80c412a43ee50168fb09b6a6311bf7c8d09e62888c149ba400636202b50ab1ec45ea -SHA512 (umbrello-22.04.1.tar.xz) = c58051d1e0c8bcedb824e2c582292452fa27743446da7666690ddbbdf5be80c412a43ee50168fb09b6a6311bf7c8d09e62888c149ba400636202b50ab1ec45ea +SHA512 (umbrello-26.08.0.tar.xz) = e46fcdc0c0f22f69b5a9b3a9829419cc468f932a69a88fe467f72aba20039245c7c7c1fe37ae61a9186a3a1f24bcd25f9a6927f7df19c1809083ea0f0e45c677 diff --git a/umbrello.spec b/umbrello.spec index 03c03d6..ba24c25 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -1,20 +1,16 @@ -%undefine __cmake_in_source_build + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} Name: umbrello Summary: UML modeler and UML diagram tool -Version: 22.04.1 +Version: 26.08.0 Release: 1%{?dist} -License: GPLv2+ and LGPLv2+ +License: CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) URL: https://www.kde.org/applications/development/umbrello/ -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable_kf5}/release-service/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches @@ -24,46 +20,40 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: libappstream-glib BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Parts) -BuildRequires: cmake(KF5TextEditor) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) +BuildRequires: kf6-rpm-macros -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) -BuildRequires: cmake(Qt5WebKitWidgets) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Test) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) + +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6Completion) +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6DocTools) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6TextEditor) +BuildRequires: cmake(KF6WidgetsAddons) +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(KF6XmlGui) %ifnarch s390x BuildRequires: cmake(KDevelop-PG-Qt) BuildRequires: cmake(KDevPlatform) %endif -BuildRequires: cmake(KF5ThreadWeaver) -BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(LLVM) BuildRequires: cmake(Clang) +BuildRequires: pkgconfig(cups) BuildRequires: llvm-devel -# API doc generation - for later use -#BuildRequires: doxygen -#BuildRequires: cmake(Qt5Help) - Conflicts: kdesdk-common < 4.10.80 Provides: kdesdk-umbrello = %{version}-%{release} Obsoletes: kdesdk-umbrello < 4.10.80 @@ -80,33 +70,270 @@ GUI for diagramming Unified Modeling Language (UML) %build -%{cmake_kf5} +%cmake_kf6 -DQT_MAJOR_VERSION=6 %cmake_build %install %cmake_install - %find_lang %{name} --all-name --with-html %check -appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.umbrello.appdata.xml ||: -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.umbrello.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.umbrello.appdata.xml ||: +desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.umbrello.desktop %files -f %{name}.lang %doc README %license COPYING -%{_kf5_bindir}/umbrello5 -%{_kf5_bindir}/po2xmi5 -%{_kf5_bindir}/xmi2pot5 -%{_kf5_metainfodir}/org.kde.umbrello.appdata.xml -%{_kf5_datadir}/applications/org.kde.umbrello.desktop -%{_kf5_datadir}/umbrello5/ -%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf6_bindir}/umbrello6 +%{_kf6_bindir}/po2xmi6 +%{_kf6_bindir}/xmi2pot6 +%{_kf6_metainfodir}/org.kde.umbrello.appdata.xml +%{_kf6_datadir}/applications/org.kde.umbrello.desktop +%{_kf6_datadir}/umbrello6/ +%{_kf6_datadir}/icons/hicolor/*/*/* %changelog +* Fri Aug 14 2026 Steve Cossette - 26.08.0-1 +- 26.08.0 + +* Fri Jul 31 2026 Steve Cossette - 26.07.90-1 +- 26.07.90 + +* Wed Jul 29 2026 Steve Cossette - 26.07.80-1 +- 26.07.80 + +* Fri Jul 17 2026 Fedora Release Engineering - 26.04.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Tue Jun 30 2026 Steve Cossette - 26.04.3-1 +- 26.04.3 + +* Tue Jun 02 2026 Steve Cossette - 26.04.2-1 +- 26.04.2 + +* Wed May 06 2026 Steve Cossette - 26.04.1-1 +- 26.04.1 + +* Sat Apr 11 2026 Steve Cossette - 26.04.0-1 +- 26.04.0 + +* Mon Mar 16 2026 Steve Cossette - 26.03.80-1 +- 26.03.80 + +* Sun Mar 08 2026 Steve Cossette - 25.12.3-1 +- 25.12.3 + +* Thu Feb 12 2026 Steve Cossette - 25.12.2-2 +- Full Stack Rebuild (kio abi break) + +* Wed Feb 04 2026 Steve Cossette - 25.12.2-1 +- 25.12.2 + +* Sat Jan 17 2026 Fedora Release Engineering - 25.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jan 07 2026 farchord@gmail.com - 25.12.1-1 +- 25.12.1 + +* Wed Dec 17 2025 Steve Cossette - 25.12.0-2 +- Upgrade to Qt6 + +* Sat Dec 06 2025 Steve Cossette - 25.12.0-1 +- 25.12.0 + +* Fri Nov 28 2025 Steve Cossette - 25.11.90-1 +- 25.11.90 + +* Sat Nov 15 2025 Steve Cossette - 25.11.80-1 +- 25.11.80 + +* Tue Nov 04 2025 Steve Cossette - 25.08.3-1 +- 25.08.3 + +* Wed Oct 08 2025 Steve Cossette - 25.08.2-1 +- 25.08.2 + +* Sun Sep 21 2025 Steve Cossette - 25.08.1-1 +- 25.08.1 + +* Sat Aug 16 2025 Marc Deop i Argemí - 25.08.0-2 +- Drop i686 support (leaf package) + +* Fri Aug 08 2025 Steve Cossette - 25.08.0-1 +- 25.08.0 + +* Fri Jul 25 2025 Steve Cossette - 25.07.90-1 +- 25.07.90 + +* Fri Jul 11 2025 Steve Cossette - 25.07.80-1 +- 25.07.80 + +* Thu Jul 03 2025 Steve Cossette - 25.04.3-1 +- 25.04.3 + +* Wed Jun 04 2025 Steve Cossette - 25.04.2-1 +- 25.04.2 + +* Wed May 14 2025 Steve Cossette - 25.04.1-1 +- 25.04.1 + +* Sat Apr 12 2025 Steve Cossette - 25.04.0-1 +- 25.04.0 + +* Thu Mar 20 2025 Steve Cossette - 25.03.80-1 +- 25.03.80 (Beta) + +* Tue Mar 04 2025 Steve Cossette - 24.12.3-1 +- 24.12.3 + +* Fri Feb 21 2025 Steve Cossette - 24.12.2-2 +- Rebuild for ppc64le enablement + +* Wed Feb 05 2025 Steve Cossette - 24.12.2-1 +- 24.12.2 + +* Sun Jan 19 2025 Fedora Release Engineering - 24.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 07 2025 Steve Cossette - 24.12.1-1 +- 24.12.1 + +* Sat Dec 07 2024 Marc Deop i Argemí - 24.12.0-1 +- 24.12.0 + +* Fri Nov 29 2024 Marc Deop i Argemí - 24.11.90-1 +- 24.11.90 + +* Fri Nov 15 2024 Marc Deop i Argemí - 24.11.80-1 +- 24.11.80 + +* Tue Nov 05 2024 Steve Cossette - 24.08.3-1 +- 24.08.3 + +* Wed Oct 09 2024 Steve Cossette - 24.08.2-1 +- 24.08.2 + +* Wed Sep 25 2024 Alessandro Astone - 24.08.1-1 +- 24.08.1 + +* Fri Aug 23 2024 Steve Cossette - 24.08.0-2 +- Temporarily disable kdevelop integration until umbrello converts over to Qt6 + +* Thu Aug 22 2024 Steve Cossette - 24.08.0-1 +- 24.08.0 + +* Sat Jul 20 2024 Fedora Release Engineering - 24.05.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sun Jul 07 2024 Marc Deop i Argemí - 24.05.2-1 +- 24.05.2 + +* Fri Jun 14 2024 Marc Deop i Argemí - 24.05.1-1 +- 24.05.1 + +* Fri May 17 2024 Marc Deop i Argemí - 24.05.0-1 +- 24.05.0 + +* Fri Apr 12 2024 Marc Deop i Argemí - 24.02.2-1 +- 24.02.2 + +* Fri Mar 29 2024 Marc Deop i Argemí - 24.02.1-1 +- 24.02.1 + +* Wed Feb 21 2024 Marc Deop i Argemí - 24.02.0-1 +- 24.02.0 + +* Wed Jan 31 2024 Marc Deop i Argemí - 24.01.95-1 +- 24.01.95 + +* Sat Jan 27 2024 Fedora Release Engineering - 24.01.90-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 11 2024 Marc Deop i Argemí - 24.01.90-1 +- 24.01.90 + +* Mon Jan 08 2024 Steve Cossette - 24.01.85-1 +- 24.01.85 (Qt5) + +* Thu Oct 12 2023 Marc Deop i Argemí - 23.08.2-1 +- 23.08.2 + +* Sat Sep 16 2023 Marc Deop i Argemí - 23.08.1-1 +- 23.08.1 + +* Sat Aug 26 2023 Marc Deop i Argemí - 23.08.0-1 +- 23.08.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 23.04.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jul 08 2023 Marc Deop i Argemí - 23.04.3-1 +- 23.04.3 + +* Tue Jun 06 2023 Marc Deop i Argemí - 23.04.2-1 +- 23.04.2 + +* Sat May 13 2023 Marc Deop i Argemí - 23.04.1-1 +- 23.04.1 + +* Fri Apr 14 2023 Marc Deop i Argemí - 23.04.0-1 +- 23.04.0 + +* Fri Mar 31 2023 Marc Deop i Argemí - 23.03.90-1 +- 23.03.90 + +* Mon Mar 20 2023 Marc Deop i Argemí - 23.03.80-1 +- 23.03.80 + +* Thu Mar 02 2023 Marc Deop i Argemí - 22.12.3-1 +- 22.12.3 + +* Sat Feb 18 2023 Than Ngo - 22.12.2-2 +- migrated to SPDX license + +* Tue Jan 31 2023 Marc Deop - 22.12.2-1 +- 22.12.2 + +* Sat Jan 21 2023 Fedora Release Engineering - 22.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jan 04 2023 Justin Zobel - 22.12.1-1 +- Update to 22.12.1 + +* Fri Dec 09 2022 Than Ngo - 22.12.0-1 +- 22.12.0 + +* Fri Nov 04 2022 Marc Deop i Argemí (Private) - 22.08.3-1 +- 22.08.3 + +* Fri Oct 14 2022 Marc Deop - 22.08.2-1 +- 22.08.2 + +* Thu Oct 06 2022 Marc Deop marcdeop@fedoraproject.org - 22.08.1-2 +- Rebuild (against proper kdevelop version) + +* Thu Sep 08 2022 Marc Deop - 22.08.1-1 +- 22.08.1 + +* Thu Sep 01 2022 Rex Dieter - 22.08.0-2 +- rebuild +- .spec cosmetics + +* Fri Aug 19 2022 Marc Deop - 22.08.0-1 +- 22.08.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 22.04.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 07 2022 Than Ngo - 22.04.3-1 +- 22.04.3 + +* Fri Jun 24 2022 Than Ngo - 22.04.2-1 +- 22.04.2 + * Thu May 12 2022 Justin Zobel - 22.04.1-1 - Update to 22.04.1