From 84734c140d8387668c31ac62c01284f886eaec41 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 4 Oct 2019 08:20:52 -0500 Subject: [PATCH 01/27] Rebuild for new freeglut. --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index cd5c44a..edf6cdb 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -64,6 +64,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Tue Sep 17 2019 Gwyn Ciesla - 5.16-6 +- Rebuilt for new freeglut + * Sat Jul 27 2019 Fedora Release Engineering - 5.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b56773859e99b76250893947f4d3c5451e4047a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:34:08 +0000 Subject: [PATCH 02/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index edf6cdb..2e714df 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -64,6 +64,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.16-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Sep 17 2019 Gwyn Ciesla - 5.16-6 - Rebuilt for new freeglut From f6d7feb48ce46dcbf861feeaf49c87b8b8c59499 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sat, 1 Feb 2020 07:57:09 +0100 Subject: [PATCH 03/27] Fix FTBFS by patching out multiple definition. --- xmakemol.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 2e714df..a7b2cf8 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -12,6 +12,8 @@ Patch0: xmakemol-5.16-fsf.patch Patch1: xmakemol-5.16-fix_vectors_on_atoms.patch Patch2: xmakemol-5.16-h-bond.patch Patch3: xmakemol-5.16-print_torsions.patch +# Fix multiple definition of bbox +Patch4: xmakemol-5.16-extern.patch BuildRequires: gcc BuildRequires: freeglut-devel @@ -47,6 +49,7 @@ bonds. Features include: %patch1 -p0 -b .vecat %patch2 -p1 -b .hbond %patch3 -p1 -b .torsion +%patch4 -p1 -b .extern %build %configure @@ -64,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Feb 01 2010 Susi Lehtola - 5.16-8 +- Patch out multiple definition of bbox. + * Fri Jan 31 2020 Fedora Release Engineering - 5.16-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 54a4edb10f672683af6399670dbdba5257400c5d Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sat, 1 Feb 2020 07:57:56 +0100 Subject: [PATCH 04/27] Fix typo in date --- xmakemol.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index a7b2cf8..64617a7 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -67,7 +67,7 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog -* Sat Feb 01 2010 Susi Lehtola - 5.16-8 +* Sat Feb 01 2020 Susi Lehtola - 5.16-8 - Patch out multiple definition of bbox. * Fri Jan 31 2020 Fedora Release Engineering - 5.16-7 From 8139804af8757777f880ae0ab40a651b7148aea5 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sat, 1 Feb 2020 07:59:36 +0100 Subject: [PATCH 05/27] Forgot to add patch.. --- xmakemol-5.16-extern.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 xmakemol-5.16-extern.patch diff --git a/xmakemol-5.16-extern.patch b/xmakemol-5.16-extern.patch new file mode 100644 index 0000000..6a5c8da --- /dev/null +++ b/xmakemol-5.16-extern.patch @@ -0,0 +1,13 @@ +diff -up xmakemol-5.16/bbox.h.orig xmakemol-5.16/bbox.h +--- xmakemol-5.16/bbox.h.orig 2020-02-01 07:47:44.183396509 +0100 ++++ xmakemol-5.16/bbox.h 2020-02-01 07:47:57.198837889 +0100 +@@ -26,7 +26,7 @@ enum bbox_type {AUTOMATIC, FROM_FILE}; + + #ifdef __BBOX_C__ + +-bounding_box bbox; ++extern bounding_box bbox; + enum bbox_type bbox_type = AUTOMATIC; + Widget bbox_dialog = NULL; /* wjq */ + Widget bbMin[4], bbMax[4]; /* 0: The whole entry line for Min, Max values, +diff -up xmakemol-5.16/Makefile.orig xmakemol-5.16/Makefile From 0e0ab1f57b49fb76b23be4a189735ad0b4b47164 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:48:41 +0000 Subject: [PATCH 06/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 64617a7..9384644 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -67,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.16-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Feb 01 2020 Susi Lehtola - 5.16-8 - Patch out multiple definition of bbox. From 543d7db9b8a1df7536b85903524d538ec90fc2bd Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:30:20 +0000 Subject: [PATCH 07/27] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmakemol.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmakemol.spec b/xmakemol.spec index 9384644..b04a21e 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -15,6 +15,7 @@ Patch3: xmakemol-5.16-print_torsions.patch # Fix multiple definition of bbox Patch4: xmakemol-5.16-extern.patch +BuildRequires: make BuildRequires: gcc BuildRequires: freeglut-devel BuildRequires: mesa-libGLU-devel From 59f27c4b356e085122e8cdc8ed2bf5d503137916 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sun, 10 Jan 2021 16:51:42 +0100 Subject: [PATCH 08/27] Fix crash for NULL widget class (BZ #1914657). --- xmakemol-5.16-widget.patch | 24 ++++++++++++++++++++++++ xmakemol.spec | 24 +++++++++++++----------- 2 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 xmakemol-5.16-widget.patch diff --git a/xmakemol-5.16-widget.patch b/xmakemol-5.16-widget.patch new file mode 100644 index 0000000..3a9d68e --- /dev/null +++ b/xmakemol-5.16-widget.patch @@ -0,0 +1,24 @@ +diff -up xmakemol-5.16/globals.h.widget xmakemol-5.16/globals.h +--- xmakemol-5.16/globals.h.widget 2021-01-10 16:39:47.912005573 +0100 ++++ xmakemol-5.16/globals.h 2021-01-10 16:40:34.380887711 +0100 +@@ -186,8 +186,6 @@ Boolean any_hydrogen; + Boolean any_hbondpartner; + Boolean view_ghost_atoms = False; + +-Widget main_w,toplevel,label,canvas,message_area; +- + Widget frames_dialog = NULL; + Widget anim_dialog = NULL; + Widget meas_dialog = NULL; +diff -up xmakemol-5.16/xmakemol.c.widget xmakemol-5.16/xmakemol.c +--- xmakemol-5.16/xmakemol.c.widget 2021-01-10 16:39:47.915005436 +0100 ++++ xmakemol-5.16/xmakemol.c 2021-01-10 16:40:45.961359918 +0100 +@@ -61,6 +61,8 @@ char xmakemol_version[6]; + until he/she responds to dialog */ + XtAppContext app; + ++Widget main_w,toplevel,label,canvas,message_area; ++ + + int + main(int argc, char **argv) diff --git a/xmakemol.spec b/xmakemol.spec index b04a21e..94e32a3 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -14,8 +14,10 @@ Patch2: xmakemol-5.16-h-bond.patch Patch3: xmakemol-5.16-print_torsions.patch # Fix multiple definition of bbox Patch4: xmakemol-5.16-extern.patch +# Fix BZ#1914657, crash about NULL widget class +Patch5: xmakemol-5.16-widget.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: freeglut-devel BuildRequires: mesa-libGLU-devel @@ -25,12 +27,8 @@ BuildRequires: libXi-devel BuildRequires: libXpm-devel BuildRequires: libICE-devel BuildRequires: zlib-devel - -%if 0%{?rhel} == 6 -BuildRequires: openmotif-devel -%else BuildRequires: motif-devel -%endif + %description XMakemol is a mouse-based program, written using the LessTif widget @@ -51,6 +49,7 @@ bonds. Features include: %patch2 -p1 -b .hbond %patch3 -p1 -b .torsion %patch4 -p1 -b .extern +%patch5 -p1 -b .widget %build %configure @@ -68,10 +67,13 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sun Jan 10 2021 Susi Lehtola - 5.16-10 +- Fix crash for NULL widget class (BZ #1914657). + * Wed Jul 29 2020 Fedora Release Engineering - 5.16-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Sat Feb 01 2020 Susi Lehtola - 5.16-8 +* Sat Feb 01 2020 Susi Lehtola - 5.16-8 - Patch out multiple definition of bbox. * Fri Jan 31 2020 Fedora Release Engineering - 5.16-7 @@ -86,12 +88,12 @@ bonds. Features include: * Sun Feb 03 2019 Fedora Release Engineering - 5.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Fri Sep 7 2018 Susi Lehtola - 5.16-3 +* Fri Sep 7 2018 Susi Lehtola - 5.16-3 - Import patches from Debian. -* Fri Sep 7 2018 Susi Lehtola - 5.16-2 +* Fri Sep 7 2018 Susi Lehtola - 5.16-2 - Review fixes. -* Thu Sep 6 2018 Susi Lehtola - 5.16-1 +* Thu Sep 6 2018 Susi Lehtola - 5.16-1 - First release. From edf1d44c83ea46a6473e43d088e3e9e665b65bf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:08:07 +0000 Subject: [PATCH 09/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 94e32a3..5bae53d 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -67,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 5.16-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 10 2021 Susi Lehtola - 5.16-10 - Fix crash for NULL widget class (BZ #1914657). From d28375c3df033da5e5df43cf6dbca2bd7bcad45e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:41:23 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 5bae53d..4b231d5 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -67,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.16-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 5.16-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b927c79cf56ba9b4f13d7212303bbbeb91348d4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:13:45 +0000 Subject: [PATCH 11/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 4b231d5..fa815bd 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -67,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.16-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.16-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 077ff67f8b4209ab57a056c8386254a53814890f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:15:37 +0000 Subject: [PATCH 12/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index fa815bd..b115943 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -67,6 +67,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.16-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 5.16-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 502ff8252592f0d3dd25f48524a5c1cf2f39261b Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 7 Sep 2022 12:49:46 +0000 Subject: [PATCH 13/27] Disable BR: freeglut-devel on epel9 --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index b115943..275b1f2 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -19,7 +19,6 @@ Patch5: xmakemol-5.16-widget.patch BuildRequires: make BuildRequires: gcc -BuildRequires: freeglut-devel BuildRequires: mesa-libGLU-devel BuildRequires: mesa-libGLw-devel BuildRequires: libX11-devel @@ -29,6 +28,10 @@ BuildRequires: libICE-devel BuildRequires: zlib-devel BuildRequires: motif-devel +%if 0%{?rhel} != 9 +# freeglut is not yet available, https://bugzilla.redhat.com/show_bug.cgi?id=2051065 +BuildRequires: freeglut-devel +%endif %description XMakemol is a mouse-based program, written using the LessTif widget From 9263cfe47f498cf79514d7623865228a2873c788 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Mon, 5 Dec 2022 10:29:51 +0000 Subject: [PATCH 14/27] Bump spec to rebuild with freeglut in RHEL9 --- xmakemol.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xmakemol.spec b/xmakemol.spec index 275b1f2..1aad1e1 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -27,11 +27,7 @@ BuildRequires: libXpm-devel BuildRequires: libICE-devel BuildRequires: zlib-devel BuildRequires: motif-devel - -%if 0%{?rhel} != 9 -# freeglut is not yet available, https://bugzilla.redhat.com/show_bug.cgi?id=2051065 BuildRequires: freeglut-devel -%endif %description XMakemol is a mouse-based program, written using the LessTif widget @@ -70,6 +66,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Mon Dec 05 2022 Susi Lehtola - 5.16-15 +- Freeglut is now available in RHEL9. + * Sat Jul 23 2022 Fedora Release Engineering - 5.16-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 24cc4a33a3d0b2d77e3c71e30f7762d61fb94e50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:35:44 +0000 Subject: [PATCH 15/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 1aad1e1..fdacb9f 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -66,6 +66,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 5.16-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 05 2022 Susi Lehtola - 5.16-15 - Freeglut is now available in RHEL9. From a104f500460704976f6a2c1f1ba3d77e155777db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:59:37 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index fdacb9f..334a1e6 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -66,6 +66,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 5.16-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 5.16-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d3469ce1c0cc34959eaa940398ec0276a7ba58bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:50:48 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 334a1e6..9e40395 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -66,6 +66,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 5.16-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 5.16-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 21ad27cecbf4525763d55f314d496b81c4c5685e Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 30 Jan 2024 11:11:11 +0000 Subject: [PATCH 18/27] Fix pointer type error --- xmakemol-5.16-pointertype.patch | 12 ++++++++++++ xmakemol.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xmakemol-5.16-pointertype.patch diff --git a/xmakemol-5.16-pointertype.patch b/xmakemol-5.16-pointertype.patch new file mode 100644 index 0000000..24f00dd --- /dev/null +++ b/xmakemol-5.16-pointertype.patch @@ -0,0 +1,12 @@ +diff -up xmakemol-5.16/edit.c.pointertype xmakemol-5.16/edit.c +--- xmakemol-5.16/edit.c.pointertype 2005-03-07 10:14:44.000000000 +0000 ++++ xmakemol-5.16/edit.c 2024-01-30 11:08:10.690500512 +0000 +@@ -1758,7 +1758,7 @@ make_scale_coords_dialog (Widget parent) + + int n = 0; + Widget atob, btoa, child, rc; +- XmString label = ""; ++ XmString label = XmStringCreateSimple(""); + + if (! scale_coords_dialog) + { diff --git a/xmakemol.spec b/xmakemol.spec index 9e40395..6ec08e8 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -16,6 +16,8 @@ Patch3: xmakemol-5.16-print_torsions.patch Patch4: xmakemol-5.16-extern.patch # Fix BZ#1914657, crash about NULL widget class Patch5: xmakemol-5.16-widget.patch +# Fix BZ#2261809, initialization of XmString from incompatible pointer type +Patch6: xmakemol-5.16-pointertype.patch BuildRequires: make BuildRequires: gcc @@ -66,6 +68,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Tue Jan 30 2024 Susi Lehtola - 5.16-19 +- Fix FTBFS on Fedora 40. + * Sat Jan 27 2024 Fedora Release Engineering - 5.16-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 771469a2319e8d939dbea92da8d2706126d8c1c6 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 30 Jan 2024 11:22:41 +0000 Subject: [PATCH 19/27] Apply patch, too --- xmakemol.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmakemol.spec b/xmakemol.spec index 6ec08e8..729c06e 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -51,6 +51,7 @@ bonds. Features include: %patch3 -p1 -b .torsion %patch4 -p1 -b .extern %patch5 -p1 -b .widget +%patch6 -p1 -b .pointertype %build %configure From 71131b91e3e371b2f72466301530b70dbbd51601 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 30 Jan 2024 15:35:04 +0000 Subject: [PATCH 20/27] need to patch another file too --- xmakemol-5.16-pointertype.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xmakemol-5.16-pointertype.patch b/xmakemol-5.16-pointertype.patch index 24f00dd..2809808 100644 --- a/xmakemol-5.16-pointertype.patch +++ b/xmakemol-5.16-pointertype.patch @@ -10,3 +10,15 @@ diff -up xmakemol-5.16/edit.c.pointertype xmakemol-5.16/edit.c if (! scale_coords_dialog) { +diff -up xmakemol-5.16/frames.c.pointertype xmakemol-5.16/frames.c +--- xmakemol-5.16/frames.c.pointertype 2007-08-25 11:20:29.000000000 +0000 ++++ xmakemol-5.16/frames.c 2024-01-30 15:34:46.934021294 +0000 +@@ -106,7 +106,7 @@ make_frame_dlg(Widget parent) + Widget *kids; + #endif + +- XmString label = ""; ++ XmString label = XmStringCreateSimple(""); + + if (! frames_dialog) { + From 7c67c6fbe5c912bdc7c8d4f2a5f719439ff14821 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 21/27] Eliminate use of obsolete %patchN syntax (#2283636) --- xmakemol.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xmakemol.spec b/xmakemol.spec index 729c06e..03b52e1 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -45,13 +45,13 @@ bonds. Features include: %prep %autosetup -N -%patch0 -p1 -b .fsf -%patch1 -p0 -b .vecat -%patch2 -p1 -b .hbond -%patch3 -p1 -b .torsion -%patch4 -p1 -b .extern -%patch5 -p1 -b .widget -%patch6 -p1 -b .pointertype +%patch -P0 -p1 -b .fsf +%patch -P1 -p0 -b .vecat +%patch -P2 -p1 -b .hbond +%patch -P3 -p1 -b .torsion +%patch -P4 -p1 -b .extern +%patch -P5 -p1 -b .widget +%patch -P6 -p1 -b .pointertype %build %configure From f314173c85ce1c5df224551412786c074dab04ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:11:44 +0000 Subject: [PATCH 22/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 03b52e1..6c700ca 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Program for visualizing atomic and molecular systems License: GPLv2+ URL: https://www.nongnu.org/xmakemol/ @@ -69,6 +69,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 5.16-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Susi Lehtola - 5.16-19 - Fix FTBFS on Fedora 40. From 1460904829507ccd32e4230c2273ecc5cc1e6819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:57:38 +0200 Subject: [PATCH 23/27] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xmakemol.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmakemol.spec b/xmakemol.spec index 6c700ca..521e375 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,8 +1,9 @@ Name: xmakemol Version: 5.16 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Program for visualizing atomic and molecular systems -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://www.nongnu.org/xmakemol/ Source0: http://savannah.nongnu.org/download/xmakemol/xmakemol-%{version}.tar.gz @@ -69,6 +70,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Fri Jul 26 2024 Miroslav Suchý - 5.16-21 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 5.16-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b8927cc95ef73a688031cfd38895840bb17e71a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:59:07 +0000 Subject: [PATCH 24/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 521e375..0eeb699 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Program for visualizing atomic and molecular systems # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -70,6 +70,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 5.16-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 5.16-21 - convert license to SPDX From 845c4b3897cb9fc9081e01e54c1a82d6e1503590 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:00 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 0eeb699..0e33129 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Program for visualizing atomic and molecular systems # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -70,6 +70,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.16-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 5.16-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 36f426817a300f2496e24bada564e7c689973b84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:44:37 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 0e33129..4f18b31 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Program for visualizing atomic and molecular systems # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -70,6 +70,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 5.16-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 5.16-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From fb3fa13946b8d0a89e3afba4c16d0cd9b6521524 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:17:28 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmakemol.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmakemol.spec b/xmakemol.spec index 4f18b31..6120b8d 100644 --- a/xmakemol.spec +++ b/xmakemol.spec @@ -1,6 +1,6 @@ Name: xmakemol Version: 5.16 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Program for visualizing atomic and molecular systems # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -70,6 +70,9 @@ bonds. Features include: %{_bindir}/xmake_anim.pl %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 5.16-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 5.16-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild