Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

[skip changelog]

.gitignore

@@ -1,2 +1,6 @@
 /ZeGrapher-3.0.1.tar.gz
 /ZeGrapher-3.0.2.tar.gz
+/ZeGrapher-3.1.tar.gz
+/ZeGrapher-3.1.1.tar.gz
+/zegrapher-70d26fb.tar.gz
+/ZeCalculator-v0.12.3.tar.gz

changelog

@@ -0,0 +1,59 @@
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 24 19:22:32 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 3.1.1-1
+- Update to 3.1.1 (#1854049)
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jan 11 20:40:10 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 3.1-1
+- Update to 3.1 (#1787890)
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Feb 18 2018 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.2-4
+- Add missing BR for gcc-c++
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.2-2
+- Remove obsolete scriptlets
+
+* Wed Oct 11 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.2-1
+- Upstream release 3.0.2
+
+* Tue Sep 26 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.1-2
+- Added patches to fix permissions, fix desktop file, add appdata and add install method
+
+* Mon Sep 25 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.1-1
+- Initial package.

sources

@@ -1 +1,2 @@
-SHA512 (ZeGrapher-3.0.2.tar.gz) = 6ec49594d040f2769a3f0b67129cff1813c094a6368e200dfa06e3bb676c91c8123d66cf5b7d2e12557d4ce0ef09a774e24e5f3f1fdd59eab945ece29a6450bb
+SHA512 (zegrapher-70d26fb.tar.gz) = 6c6c955e4bf9c85a2dec8cf00d62f825cb3d5fce5afcf47fbbf08bba1b9f56e65e48d209d7de477f2d94d347ecfa95d48b6391418d9f1f81091d443e392d8f5d
+SHA512 (ZeCalculator-v0.12.3.tar.gz) = a939c4dceb47a5d9cd0268e458c8e7c8833fc58b5daaeab5d76cbf7e7800b87f4388782be50feebb16a70181c8b0f5677db4e1219a3861ce0789e6a826d6cdbd

zegrapher-3.0.2-fix_appdata.patch

@@ -1,18 +0,0 @@
-diff -up ZeGrapher-3.0.2/ZeGrapher.appdata.xml.fix_appdata ZeGrapher-3.0.2/ZeGrapher.appdata.xml
---- ZeGrapher-3.0.2/ZeGrapher.appdata.xml.fix_appdata	2017-10-09 18:12:25.000000000 +0200
-+++ ZeGrapher-3.0.2/ZeGrapher.appdata.xml	2017-10-11 12:20:26.366002113 +0200
-@@ -15,11 +15,11 @@
-     <p>
-         Here is what Zegrapher v3.0 can offer you:<br/>
-         <ul>
--            <li>Visualize up to six functions simultaneously. All the usual functions can be called: they're all written on a virtual keyboard. <br/>
--                On a given function, others can be called, so it is possible to associate or compose functions.</li>
-+            <li>Visualize up to six functions simultaneously. All the usual functions can be called: they're all written on a virtual keyboard.
-+            On a given function, others can be called, so it is possible to associate or compose functions.</li>
-             <li>Numerical sequence plotting, they can be defined by a recurrent relation or explicitly.</li>
-             <li>Parametric equation plotting. The curves can be animated, with adjustable smoothness (frame rate) and speed (ms per step).</li>
--            <li>Experimental data plot and polynomial fit (regression). Data can be imported/exported from a CSV file.
-+            <li>Experimental data plot and polynomial fit (regression). Data can be imported/exported from a CSV file.</li>
-             <li>Parametric plot for functions, sequences and parametric equations: the parameter symbol to use is "k".</li>
-             <li>Plot tangents: they can be moved and resized simply with the mouse.</li>
-             <li>Plot derivatives and antiderviatives.</li>

zegrapher.spec

@@ -1,91 +1,75 @@
-%global altname ZeGrapher
+%global gitdate 20260105
+%global commit 70d26fbca881b99a0a58c16f3802339e38c924eb
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           zegrapher
 Summary:        Free and opensource math graphing software
-Version:        3.0.2
-Release:        4%{?dist}
-License:        GPLv3+
+Version:        3.1.1^%{gitdate}git%{shortcommit}
+Release:        %autorelease
+License:        AGPL-3.0-or-later
 
 URL:            https://www.zegrapher.com/
-Source0:        https://github.com/AdelKS/%{altname}/archive/v%{version}/%{altname}-%{version}.tar.gz
-
-Patch0:         zegrapher-3.0.2-fix_appdata.patch
+Source0:        https://github.com/AdelKS/ZeGrapher/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source1:        https://github.com/AdelKS/ZeCalculator/archive/v0.12.3/ZeCalculator-v0.12.3.tar.gz
 
 BuildRequires:  gcc-c++
+BuildRequires:  meson
 BuildRequires:  boost-devel
-BuildRequires:  pkgconfig(Qt5)
-BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(Qt6Network)
+BuildRequires:  cmake(Qt6Svg)
+BuildRequires:  cmake(Qt6Quick)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6QuickWidgets)
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
 
+# License: AGPL-3.0-or-later
+Provides:       bundled(zecalculator) = 0.12.3
 
 %description
-ZeGrapher is a plotting program for functions, sequences, parametric equations, 
+ZeGrapher is a plotting program for functions, sequences, parametric equations,
 and tabular data. It has been designed to be as easy to use as possible.
 
 ZeGrapher supports importing and exporting of tabular data from and to CSV files
-and polynomial (regression) fits, plotting of tangents (the point can be 
-selected interactively). Calculation and plotting of derivatives and integrals 
+and polynomial (regression) fits, plotting of tangents (the point can be
+selected interactively). Calculation and plotting of derivatives and integrals
 is also possible.
 
 Plots can be exported in various image formats and as PDF files.
 
-
 %prep
-%autosetup -p1 -n %{altname}-%{version}
-sed -i 's|^QMAKE_LFLAGS_RELEASE = -s|QMAKE_LFLAGS_RELEASE =|' ZeGrapher.pro
-
-# To remove when Patch1 is through:
-cp icons/software.png icons/%{altname}.png
+%autosetup -p1 -C
+mkdir -p subprojects/zecalculator
+tar xf %{SOURCE1} -C subprojects/zecalculator --strip-components=1
 
+sed -i "s|meson.project_version()|'%{version}'|" meson.build
 
 %build
-mkdir build && pushd build
-%qmake_qt5 ../ PREFIX=%{_prefix}
-%make_build
-popd
-
+%meson --buildtype=debugoptimized -Dtest=true
+%meson_build
 
 %install
-pushd build
-%make_install INSTALL_ROOT=%{buildroot}
-popd
-
-%find_lang %{altname} --with-qt
+%meson_install
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{altname}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{altname}.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
 
+%meson_test
 
-%files -f %{altname}.lang
+%files
 %doc README.md
 %license LICENSE
-%{_bindir}/%{altname}
-%{_datadir}/appdata/%{altname}.appdata.xml
-%{_datadir}/applications/%{altname}.desktop
-%{_datadir}/icons/hicolor/128x128/apps/%{altname}.png
-%dir %{_datadir}/%{altname}
-
+%{_bindir}/ZeGrapher
+%{_datadir}/applications/ZeGrapher.desktop
+%{_datadir}/icons/hicolor/*/apps/ZeGrapher.png
+%{_datadir}/icons/hicolor/scalable/apps/ZeGrapher.svg
+%{_datadir}/metainfo/ZeGrapher.metainfo.xml
 
 %changelog
-* Sun Feb 18 2018 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.2-4
-- Add missing BR for gcc-c++
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.0.2-2
-- Remove obsolete scriptlets
-
-* Wed Oct 11 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.2-1
-- Upstream release 3.0.2
-
-* Tue Sep 26 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.1-2
-- Added patches to fix permissions, fix desktop file, add appdata and add install method
-
-* Mon Sep 25 2017 Robert-André Mauchin <zebob.m@gmail.com> - 3.0.1-1
-- Initial package.
-
-
+%autochangelog