Compare commits

..

No commits in common. "rawhide" and "f36" have entirely different histories.

5 changed files with 99 additions and 103 deletions

2
.gitignore vendored
View file

@ -2,5 +2,3 @@
/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

View file

@ -0,0 +1,24 @@
From d2e95b597b07c86299a8f057970cf2dd6a807edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
<30413512+eclipseo@users.noreply.github.com>
Date: Mon, 24 Aug 2020 19:45:30 +0200
Subject: [PATCH] Grab ZeGrapher.appdata.xml from the appdata dir
It's trying to find the Appdata file from the root directory while it is actually in the appdata directory.
---
ZeGrapher.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ZeGrapher.pro b/ZeGrapher.pro
index f59c964..834c1c0 100644
--- a/ZeGrapher.pro
+++ b/ZeGrapher.pro
@@ -204,7 +204,7 @@ target.path = $$INSTROOT$$BINDIR
translations.path = $$INSTROOT$$DSRDIR/locale
desktop.files = ZeGrapher.desktop
-appdata.files = ZeGrapher.appdata.xml
+appdata.files = appdata/ZeGrapher.appdata.xml
icon.files = icons/ZeGrapher.png
translations.files = ZeGrapher_fr.qm

View file

@ -1,59 +0,0 @@
* 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.

View file

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

View file

@ -1,35 +1,24 @@
%global gitdate 20260105
%global commit 70d26fbca881b99a0a58c16f3802339e38c924eb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global altname ZeGrapher
Name: zegrapher
Summary: Free and opensource math graphing software
Version: 3.1.1^%{gitdate}git%{shortcommit}
Release: %autorelease
License: AGPL-3.0-or-later
Version: 3.1.1
Release: 4%{?dist}
License: GPLv3+
URL: https://www.zegrapher.com/
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
Source0: https://github.com/AdelKS/%{altname}/archive/v%{version}/%{altname}-%{version}.tar.gz
# Grab ZeGrapher.appdata.xml from the appdata dir
Patch0: https://patch-diff.githubusercontent.com/raw/AdelKS/ZeGrapher/pull/19.patch#/0001-Grab-ZeGrapher.appdata.xml-from-the-appdata-dir.patch
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: meson
BuildRequires: boost-devel
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: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5WebKit)
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,
and tabular data. It has been designed to be as easy to use as possible.
@ -42,34 +31,79 @@ is also possible.
Plots can be exported in various image formats and as PDF files.
%prep
%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
%autosetup -p1 -n %{altname}-%{version}
sed -i 's|^QMAKE_LFLAGS_RELEASE = -s|QMAKE_LFLAGS_RELEASE =|' ZeGrapher.pro
%build
%meson --buildtype=debugoptimized -Dtest=true
%meson_build
mkdir build && cd build
%qmake_qt5 ../ PREFIX=%{_prefix}
%make_build
%install
%meson_install
%make_install INSTALL_ROOT=%{buildroot} -C build
%find_lang %{altname} --with-qt
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/%{altname}.desktop
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{altname}.appdata.xml
%meson_test
%files
%files -f %{altname}.lang
%doc README.md
%license LICENSE
%{_bindir}/ZeGrapher
%{_datadir}/applications/ZeGrapher.desktop
%{_datadir}/icons/hicolor/*/apps/ZeGrapher.png
%{_datadir}/icons/hicolor/scalable/apps/ZeGrapher.svg
%{_datadir}/metainfo/ZeGrapher.metainfo.xml
%{_bindir}/%{altname}
%{_metainfodir}/%{altname}.appdata.xml
%{_datadir}/applications/%{altname}.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{altname}.png
%dir %{_datadir}/%{altname}
%changelog
%autochangelog
* 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.