Compare commits

...
Sign in to create a new pull request.

32 commits

Author SHA1 Message Date
Fedora Release Engineering
4fe2c56411 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:27:04 +00:00
Fedora Release Engineering
1f50c6fcd4 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 16:45:37 +00:00
Fedora Release Engineering
8cf218d876 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 10:35:36 +00:00
Miroslav Suchý
bef3a50584 convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-08-28 07:46:27 +02:00
Fedora Release Engineering
b499904eef Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 16:36:27 +00:00
Miro Hrončok
cd107364c7 Switch to %autosetup
[skip changelog]
2024-04-30 10:13:09 +02:00
Miro Hrončok
7f815f396c Convert to %autorelease and %autochangelog
[skip changelog]
2024-01-29 15:32:02 +01:00
Fedora Release Engineering
34f92e875b Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 07:21:26 +00:00
Fedora Release Engineering
5f4dd2a9ba Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 12:11:44 +00:00
Fedora Release Engineering
819f73bf84 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 12:54:46 +00:00
Fedora Release Engineering
e8f6d892eb Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 21:24:13 +00:00
Fedora Release Engineering
801046c888 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 20:26:57 +00:00
Miro Hrončok
15044f2eff https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval 2022-07-18 14:38:45 +02:00
Fedora Release Engineering
13a751d39c - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 20:56:10 +00:00
Fedora Release Engineering
4dd2a2deed - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 17:16:01 +00:00
Fedora Release Engineering
f74155346b - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 12:20:50 +00:00
Fedora Release Engineering
5ba3d8f80b - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-25 23:48:40 +00:00
Tom Stellard
18f15ed9e0 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-15 01:52:44 +00:00
Fedora Release Engineering
e900eb40c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 11:45:02 +00:00
Fedora Release Engineering
762c581907 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 11:13:15 +00:00
Fedora Release Engineering
77b2fb38ac - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 17:33:53 +00:00
Fedora Release Engineering
638ece1c2c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 12:58:24 +00:00
Fedora Release Engineering
4c41e4fb21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 19:59:48 +00:00
Rex Dieter
cbbe5c76df Revert "drop BR: pkgconfig(Qt5)"
This reverts commit 8f081b9888.

(sorry, rethinking)
2018-03-08 11:13:40 -06:00
Rex Dieter
8f081b9888 drop BR: pkgconfig(Qt5)
it's not needed, should not be used
2018-03-08 11:12:33 -06:00
Miro Hrončok
7f9c861ca3 Add BR gcc-c++ 2018-02-20 15:54:26 +01:00
Fedora Release Engineering
fed277896f - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 01:53:23 +00:00
Igor Gnatenko
24ef1a3f1b Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-07 19:00:34 +01:00
Miro Hrončok
ebaf4c4b6e Fix FTBFS 2017-08-07 18:11:17 +02:00
Fedora Release Engineering
72224ac94b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 17:24:28 +00:00
Fedora Release Engineering
9715e27422 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 02:36:28 +00:00
Fedora Release Engineering
fe237eba78 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 05:45:30 +00:00
3 changed files with 113 additions and 29 deletions

29
admeshgui-qt571.patch Normal file
View file

@ -0,0 +1,29 @@
From 1732bc83cb2c949089d98cd9be0e922ac4af4a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
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 */

View file

@ -1,14 +1,19 @@
Name: admeshgui Name: admeshgui
%global camelname ADMeshGUI %global camelname ADMeshGUI
Version: 1.0.1 Version: 1.0.1
Release: 3%{?dist} Release: %autorelease
Summary: STL viewer and manipulation tool Summary: STL viewer and manipulation tool
# Code is AGPLv3 logo/license is LGPLv3 or CC-BY-SA # 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} URL: https://github.com/vyvledav/%{camelname}
Source0: https://github.com/vyvledav/%{camelname}/archive/v%{version}.tar.gz 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: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
BuildRequires: pkgconfig(libadmesh) >= 0.98.2 BuildRequires: pkgconfig(libadmesh) >= 0.98.2
BuildRequires: pkgconfig(Qt5Core) >= 5.4 BuildRequires: pkgconfig(Qt5Core) >= 5.4
@ -18,12 +23,18 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.4
BuildRequires: pkgconfig(Qt5Widgets) >= 5.4 BuildRequires: pkgconfig(Qt5Widgets) >= 5.4
BuildRequires: pkgconfig(Qt5) >= 5.4 BuildRequires: pkgconfig(Qt5) >= 5.4
BuildRequires: stlsplit-devel BuildRequires: stlsplit-devel
BuildRequires: make
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Provides: %{camelname}%{_isa} = %{version}-%{release} Provides: %{camelname}%{_isa} = %{version}-%{release}
Provides: %{camelname} = %{version}-%{release} Provides: %{camelname} = %{version}-%{release}
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
ExcludeArch: %{ix86}
%endif
%description %description
Extension for ADMesh tool in the form of graphical user interface. ADMesh tool 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 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. selected actions and to get visual feedback of those.
%prep %prep
%setup -qn %{camelname}-%{version} %autosetup -p1 -n %{camelname}-%{version}
%build %build
%{qmake_qt5} PREFIX=%{buildroot}/usr %{qmake_qt5} PREFIX=%{buildroot}/usr
@ -44,21 +56,6 @@ make install
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml 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 %files
%license LICENSE LOGO-LICENSE %license LICENSE LOGO-LICENSE
@ -71,14 +68,4 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%changelog %changelog
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3 %autochangelog
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Feb 01 2016 Rex Dieter <rdieter@fedoraproject.org> 1.0.1-2
- use %%qmake_qt5 macro to ensure proper build flags
* Wed Sep 16 2015 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
- update
* Fri May 22 2015 Miro Hrončok <mhroncok@redhat.com> - 1.0-1
- Initial package

68
changelog Normal file
View file

@ -0,0 +1,68 @@
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.1-8
- Remove obsolete scriptlets
* Mon Aug 07 2017 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
- Fix FTBFS
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Feb 01 2016 Rex Dieter <rdieter@fedoraproject.org> 1.0.1-2
- use %%qmake_qt5 macro to ensure proper build flags
* Wed Sep 16 2015 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
- update
* Fri May 22 2015 Miro Hrončok <mhroncok@redhat.com> - 1.0-1
- Initial package