diff --git a/admeshgui-qt571.patch b/admeshgui-qt571.patch new file mode 100644 index 0000000..d45fc36 --- /dev/null +++ b/admeshgui-qt571.patch @@ -0,0 +1,29 @@ +From 1732bc83cb2c949089d98cd9be0e922ac4af4a28 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 4 Apr 2017 20:25:58 +0200 +Subject: [PATCH] Handle 2 argument translation calls generated by Qt 5.7.1 + +This fixes a FTBFS error described in https://github.com/openscad/openscad/issues/1872 + +Fix from https://github.com/openscad/openscad/commit/4fa5f0340a2b7b031a0b39f7de0ca795d52bb68b +--- + data.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/data.h b/data.h +index 83fc9ff..e5404f0 100644 +--- a/data.h ++++ b/data.h +@@ -23,6 +23,12 @@ inline QString _( const char *msgid, int category ) + Q_UNUSED( category ); + return QString::fromUtf8( _( msgid ) ); + } ++inline QString _( const char *msgid, const char *disambiguation ) ++{ ++ Q_UNUSED(disambiguation); ++ return QString::fromUtf8(_(msgid)); ++} ++ + /** END TAG */ + + diff --git a/admeshgui.spec b/admeshgui.spec index b1cdb7b..ec03529 100644 --- a/admeshgui.spec +++ b/admeshgui.spec @@ -1,14 +1,19 @@ Name: admeshgui %global camelname ADMeshGUI Version: 1.0.1 -Release: 3%{?dist} +Release: %autorelease Summary: STL viewer and manipulation tool # Code is AGPLv3 logo/license is LGPLv3 or CC-BY-SA -License: AGPLv3 and (LGPLv3 or CC-BY-SA) +# Automatically converted from old format: AGPLv3 and (LGPLv3 or CC-BY-SA) - review is highly recommended. +License: AGPL-3.0-only AND (LGPL-3.0-only OR LicenseRef-Callaway-CC-BY-SA) URL: https://github.com/vyvledav/%{camelname} Source0: https://github.com/vyvledav/%{camelname}/archive/v%{version}.tar.gz +# https://github.com/admesh/ADMeshGUI/commit/1732bc83cb2c949089d98cd9be0e922ac4af4a28 +Patch0: %{name}-qt571.patch + BuildRequires: desktop-file-utils +BuildRequires: gcc-c++ BuildRequires: libappstream-glib BuildRequires: pkgconfig(libadmesh) >= 0.98.2 BuildRequires: pkgconfig(Qt5Core) >= 5.4 @@ -18,12 +23,18 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.4 BuildRequires: pkgconfig(Qt5Widgets) >= 5.4 BuildRequires: pkgconfig(Qt5) >= 5.4 BuildRequires: stlsplit-devel +BuildRequires: make Requires: hicolor-icon-theme Provides: %{camelname}%{_isa} = %{version}-%{release} Provides: %{camelname} = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +ExcludeArch: %{ix86} +%endif + %description Extension for ADMesh tool in the form of graphical user interface. ADMesh tool allows to manipulate and repair 3D models in the STL format. This graphical @@ -31,7 +42,8 @@ user interface allows the user to view the model in 3D viewer, to perform selected actions and to get visual feedback of those. %prep -%setup -qn %{camelname}-%{version} +%autosetup -p1 -n %{camelname}-%{version} + %build %{qmake_qt5} PREFIX=%{buildroot}/usr @@ -44,21 +56,6 @@ make install desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml -%post -update-desktop-database &>/dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - -%posttrans -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : -glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %files %license LICENSE LOGO-LICENSE @@ -71,14 +68,4 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %changelog -* Wed Feb 03 2016 Fedora Release Engineering - 1.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Feb 01 2016 Rex Dieter 1.0.1-2 -- use %%qmake_qt5 macro to ensure proper build flags - -* Wed Sep 16 2015 Miro Hrončok - 1.0.1-1 -- update - -* Fri May 22 2015 Miro Hrončok - 1.0-1 -- Initial package +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..f3f50b6 --- /dev/null +++ b/changelog @@ -0,0 +1,68 @@ +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.0.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.0.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 1.0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 1.0.1-8 +- Remove obsolete scriptlets + +* Mon Aug 07 2017 Miro Hrončok - 1.0.1-7 +- Fix FTBFS + +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Feb 01 2016 Rex Dieter 1.0.1-2 +- use %%qmake_qt5 macro to ensure proper build flags + +* Wed Sep 16 2015 Miro Hrončok - 1.0.1-1 +- update + +* Fri May 22 2015 Miro Hrončok - 1.0-1 +- Initial package