diff --git a/.gitignore b/.gitignore index 4335d68..e3093e6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,3 @@ /wxmacmolplt-7.5.tar.gz /wxmacmolplt-7.6.2.tar.gz /wxmacmolplt-7.7.tar.gz -/wxmacmolplt-5107134f0d5c30bfeda3aafa3bd911c9eb0d02c3.tar.gz -/wxmacmolplt-fc6f3c184d3bad7bce7c6ab1ce89d9f6222c985f.tar.gz -/wxmacmolplt-161e14621640775e98bd7d7f46520b09c84d8f09.tar.gz -/wxmacmolplt-7.7.2.tar.gz -/wxmacmolplt-7.7.3.tar.gz diff --git a/sources b/sources index 673e002..c3be373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxmacmolplt-7.7.3.tar.gz) = 4ba2195e58c1ebf511d9343bfb729d0be4591f170c2e65601ac33108722085e2b11bb234616fd1b7bca6dcf2dc24fad2becd366dbdd19ef4e70b9b1e4c9cdcc1 +e4c8ec2b47532423c5e5f67aa62c2af7 wxmacmolplt-7.7.tar.gz diff --git a/wxmacmolplt.spec b/wxmacmolplt.spec index ddd9109..9ea3762 100644 --- a/wxmacmolplt.spec +++ b/wxmacmolplt.spec @@ -1,20 +1,22 @@ -%global commit 161e14621640775e98bd7d7f46520b09c84d8f09 -%global date 20210927 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: wxmacmolplt -Version: 7.7.3 -Release: 7%{?dist} +Version: 7.7 +Release: 10%{?dist} Summary: A graphics program for plotting 3-D molecular structures and normal modes -License: GPL-2.0-or-later +License: GPLv2+ URL: http://brettbode.github.io/wxmacmolplt/ -Source0: https://github.com/brettbode/wxmacmolplt/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: make +# http://brettbode.github.io/wxmacmolplt/downloads.html +# -> https://uofi.box.com/shared/static/7pzccnku3uv0mmf6il6yiqghf4b34lc7.gz +Source0: https://public.boxcloud.com/d/1/Oj-GfT43PM2JETaILGilJVHNB_9f_ljhMpkSNG-NNRrFqGCr2irf1LApKotdcJeRBz9nyiukYmpZqX-P8vjSvV_8WLkMCOnuNcU8YWQVqIgAZ9YZQCDkK6dYL_bOmetSVkXD1vaTjenko7nWGN_su3odl5enZFZu7eL1fpUkzoraljb8yc8PyIkA_SPhvhGuKtNAe1wwmOSeSv-hy_CN4lVLU-C-d0Ye-kI718OQtZQ1IXfb8HekWAi2Nyv3IQtweWREsVi0S1xzr5Y8oWjMBokX9ZcGOoGE9ShfdqPjEw4pIZPliQNL2aECMo60C6AjUU1q6ecN_pvqR-WlGHUGCG3h38ym0n_npMDik3WSgA6no5ElWm2zK3Z_OMn35Ejqc5hnIT_gRFwmiQcZ_Q8HWqzs32K3Ao4EytDH9YT2xnk0b7CDRtCA80eYR7rdanUjgVAUJ2GFFJoVgL7M4aAfnfweJ2OMi1nGkdjgi7j3QV7ENPRWIPHMOU-W2eBdFjdccQyu0Hq_TUSjfI-jzQlHqU6XjPOvOWMhL8Yf3aMcggpRrq4WdnlDkyTK_rI6DwJCRIBoPj5TIWDGq-lHvIkQFyWKo2r94BlLJjDXfO7Zl0nHvyEOqvGSB6FRJ-yzADPhOE_w3tsal-jL_nj0TA8vuuTQdo1pC9ABCAhZr9rDrj8sz4dPkD2UhBJ_qlRS_1ahtz-s99VNl5rQQKyWM_38LK6W5K_ybme8wThICf04EUeVmSG_V9k-Kvc0LOXNkRlENcvGdWd1werEmbMjB6cSsGatbzlxW6WkVk7hBRUUs3o2i9gn05_qBeX2DhZ-wXUx-e-XayK6PtShZAR_gEtG4OOsl5lM8L58XVIKs5H3rnn153W60_v7351si8S2xkE7YEi237F6nK_E3vhdyQ2WI9lW25tEzftzLmkKt-xeDxU7iQG5gc7yWK75AJ1IB9KRY-i219Ws-jJiAnMjWESKwf44yo9k6AOt35aMTeTYy6MeNIdxdKXPMHvPdE0e4CE4LAGGXPnD3Dd98fm00Vzw7TmUrTnIjnsTja_Ir8yp06HhWKspr78hm_PICNgW82_LZuB17Bf0kppLx8bWFRK39VzENhcnTzbLOm61Bi3R3uYFw3gAcKm9KHtzn1iHPQJ3iamZhOEDmlPc33sgK1sRzxCfiwIJl84YUaderMSX-ansPvCGMPA./download#/wxmacmolplt-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: glew-devel -BuildRequires: wxGTK-devel +BuildRequires: ming-devel +%if 0%{?fedora} >= 25 +BuildRequires: wxGTK3-devel BuildRequires: automake +%else +BuildRequires: wxGTK-devel >= 2.6.3 +%endif Requires: hicolor-icon-theme %description @@ -36,25 +38,36 @@ MacMolPlt is: %prep %setup -q -chmod -x MacMolPlt_Manual.html -rm -rv src/glew.{cpp,h} %build autoreconf -vif %configure \ --docdir=%{_pkgdocdir} \ - --with-glew \ - --with-wx-config=%{_bindir}/wx-config-3.2 \ + --with-ming \ +%if 0%{?fedora} >= 25 + --with-wx-config=%{_bindir}/wx-config-3.0 \ +%endif - -%make_build +make %{?_smp_mflags} %install -%make_install +make DESTDIR=%{buildroot} install install -Dpm644 resources/wxmacmolplt.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmacmolplt.png desktop-file-install --dir=%{buildroot}%{_datadir}/applications resources/wxmacmolplt.desktop rm %{buildroot}%{_pkgdocdir}/LICENSE +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %license LICENSE %{_bindir}/wxmacmolplt @@ -64,94 +77,6 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE %{_datadir}/wxmacmolplt %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 7.7.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 7.7.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 7.7.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 7.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 7.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 7.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Jan 02 2024 Dominik Mierzejewski 7.7.3-1 -- update to 7.7.3 (resolves rhbz#2256352) -- use SPDX identifier in License tag - -* Sat Jul 22 2023 Fedora Release Engineering - 7.7.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 7.7.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Nov 24 2022 Dominik Mierzejewski - 7.7.2-8 -- switch to tagged tarball source URL -- rebuild for wxGLCanvas change - -* Mon Jul 25 2022 Scott Talbert - 7.7.2-7 -- Rebuild for wxGTK 3.2.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 7.7.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 10 2022 Scott Talbert - 7.7.2-5 -- Rebuild for wxGTK 3.1.7 - -* Tue Apr 12 2022 Dominik Mierzejewski - 7.7.2-4 -- rebuilt for wxGTK 3.1.6 - -* Thu Feb 10 2022 Orion Poplawski - 7.7.2-3 -- Rebuild for glew 2.2 - -* Sat Jan 22 2022 Fedora Release Engineering - 7.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 28 2021 Dominik Mierzejewski 7.7.2-1 -- update to 7.7.2 -- use modern make macros - -* Fri Jul 23 2021 Fedora Release Engineering - 7.7.1-0.3.20210718gitfc6f3c1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jul 19 2021 Dominik Mierzejewski 7.7.1-0.2.20210718gitfc6f3c1 -- latest git commit -- fixes wxGTK assertion (https://github.com/brettbode/wxmacmolplt/issues/124) - -* Tue Jul 06 2021 Dominik Mierzejewski 7.7.1-0.1.20200517git5107134 -- update to 7.7.1 pre-release -- ensure bundled glew and ming are not used for build -- build against wxGTK 3.1 -- stop forcing C++14 (only ming glue was failing to build with C++17) - -* Mon Jun 07 2021 Dominik Mierzejewski 7.7-17 -- drop ming support (package orphaned) - -* Wed Jan 27 2021 Fedora Release Engineering - 7.7-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Aug 18 2020 Jeff Law - 7.7-15 -- Force C++14 as this code is not C++17 ready - -* Wed Jul 29 2020 Fedora Release Engineering - 7.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 7.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 7.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 7.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Thu Aug 23 2018 Nicolas Chauvet - 7.7-10 - Rebuilt for glew 2.1.0