Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

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

xmakemol-5.16-pointertype.patch

@@ -0,0 +1,24 @@
+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 -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) {
+ 

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)

xmakemol.spec

@@ -1,8 +1,9 @@
 Name:           xmakemol
 Version:        5.16
-Release:        5%{?dist}
+Release:        25%{?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
 
@@ -12,9 +13,15 @@ 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
+# 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
-BuildRequires:  freeglut-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  mesa-libGLw-devel
 BuildRequires:  libX11-devel
@@ -22,12 +29,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
+BuildRequires:  freeglut-devel
 
 %description
 XMakemol is a mouse-based program, written using the LessTif widget
@@ -43,10 +46,13 @@ bonds.  Features include:
 
 %prep
 %autosetup -N
-%patch0 -p1 -b .fsf
-%patch1 -p0 -b .vecat
-%patch2 -p1 -b .hbond
-%patch3 -p1 -b .torsion
+%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
@@ -64,18 +70,78 @@ bonds.  Features include:
 %{_bindir}/xmake_anim.pl
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 5.16-21
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jan 30 2024 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-19
+- Fix FTBFS on Fedora 40.
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Dec 05 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-15
+- Freeglut is now available in RHEL9.
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 10 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-10
+- Fix crash for NULL widget class (BZ #1914657).
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Feb 01 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-8
+- Patch out multiple definition of bbox.
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 5.16-6
+- Rebuilt for new freeglut
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Fri Sep  7 2018 Susi Lehtola <susi.lehtola@gmail.com> - 5.16-3
+* Fri Sep  7 2018 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-3
 - Import patches from Debian.
 
-* Fri Sep  7 2018 Susi Lehtola <susi.lehtola@gmail.com> - 5.16-2
+* Fri Sep  7 2018 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-2
 - Review fixes.
 
-* Thu Sep  6 2018 Susi Lehtola <susi.lehtola@gmail.com> - 5.16-1
+* Thu Sep  6 2018 Susi Lehtola <jussilehtola@fedoraproject.org> - 5.16-1
 - First release.