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

[skip changelog]

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xbae
-# $Id$
-NAME := xbae
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

changelog

@@ -0,0 +1,137 @@
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Feb 05 2024 Gwyn Ciesla <gwync@protonmail.com> - 4.60.4-41
+- Patch for stricter flags
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 03 2023 Gwyn Ciesla <gwync@protonmail.com> - 4.60.4-38
+- migrated to SPDX license
+
+* Thu Feb 16 2023 Florian Weimer <fweimer@redhat.com> - 4.60.4-37
+- Port configure script to C99
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.60.4-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Oct 01 2015 Jon Ciesla <limburgher@gmail.com> - 4.60.4-21
+- Move from lesstif to motif, BZ 1267852.
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Sep 20 2008 Patrice Dumas <pertusus@free.fr> 4.60.4-10
+- use %%patch0 instead of %%patch (#463002)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.60.4-9
+- Autorebuild for GCC 4.3
+
+* Wed Aug 22 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-8
+- fix license and source url
+
+* Wed Jul 25 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-7
+- add rhel conditionals
+
+* Sat May 12 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-6
+- keep timestamps
+- examples/builderXcessory is arch specific
+
+* Sun Dec 10 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-5
+- Requires automake is for -devel (#219047)
+
+* Sat Sep  9 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-4
+- add BuildRequires libXmu-devel for examples
+
+* Thu Aug 31 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-3
+- rebuild against lesstif
+- add Obsolete/Provides for Xbae
+
+* Fri Aug 25 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-2
+- remove dependency on Wcl-devel (was only of use for an example)
+- clean docs
+
+* Thu May 18 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-1
+- Packaged for fedora extras

pointer-types.patch

@@ -0,0 +1,22 @@
+--- src/Methods.c~	2006-05-26 03:57:25.000000000 -0500
++++ src/Methods.c	2024-02-05 14:31:58.138011816 -0600
+@@ -1688,7 +1688,7 @@
+                                          * The event must have occurred in a legal position
+                                          * otherwise control wouldn't have made it here
+                                          */
+-                                        xbaeEventToRowColumn(mw, event, &r, &c, &x, &y);
++                                        xbaeEventToRowColumn((Widget)mw, event, &r, &c, &x, &y);
+                                         x -= mw->matrix.cell_shadow_thickness;
+                                         y -= mw->matrix.cell_shadow_thickness;
+                                         position = XmTextXYToPos(TextField(mw), x, y);
+--- examples/tests/leak2.c~	2003-06-21 04:38:46.000000000 -0500
++++ examples/tests/leak2.c	2024-02-05 14:45:03.587744588 -0600
+@@ -20,7 +20,7 @@
+ 
+ XtResource	resources[] = {
+ 	{ "numIter", "NumIter", XtRInt, sizeof(int),
+-		XtOffsetOf(AppRes, numIter), XtRImmediate, 1000 },
++		XtOffsetOf(AppRes, numIter), XtRImmediate, (void *)1000 },
+ };
+ 
+ int

xbae-configure-c99.patch

@@ -0,0 +1,65 @@
+Fix an implicit declaration of the exit function in the
+libXp/rc=XpQueryVersion autoconf probe.  Future compilers will not
+support implicit function declarations by default, causing the probe
+to always fail.
+
+Also included are C99 compatibility fixes for historic autoconf
+incompatibilities, long since fixed in autoconf upstream.
+
+Submitted upstream: <https://sourceforge.net/p/xbae/patches/3/>
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 36b4569680ea8531..0bda82ef7480beaf 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -334,7 +334,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ ],
+ lt_cv_libxp=yes,
+diff --git a/configure b/configure
+index f43d920c33b055ff..5e82cda106a450e8 100755
+--- a/configure
++++ b/configure
+@@ -2937,7 +2937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4120,7 +4120,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+-   '' \
++   '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+@@ -4477,8 +4477,8 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -21418,7 +21418,7 @@ Display *display=NULL;
+ short   major_version, minor_version;
+ Status rc;
+ rc=XpQueryVersion(display, &major_version, &minor_version);
+-exit(0);
++return 0;
+ }
+ 
+   ;

xbae.spec

@@ -1,47 +1,33 @@
-# xbae wasn't in fedora with monolithic X (fedora < 5), but it 
-# could be possible to do the needed conditionals
-# motif switched to lesstif in fedora 6 and fedora extras 5 is not 
-# maintained anymore, it could be possible to add the conditionals
-%if 0%{?rhel}
-%if 0%rhel <= 4
-%define monolithic_X 1
-%endif
-%endif
-
 Name:           xbae
 Version:        4.60.4
-Release:        11%{?dist}
+Release:        %autorelease
 Summary:        Motif matrix, caption and text input widgets
-Group:          System Environment/Libraries
 # all the files are covered by the MIT license, except DebugUtil.c LGPLv2+
-License:        LGPLv2+
+License:        LGPL-2.0-or-later
 URL:            http://xbae.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/xbae/xbae-%{version}.tar.gz
 # this fixes the link of the example using Wcl, it shouldn't be of use
 # now that Wcl isn't buildrequired, but it is still better.
 Patch0:         xbae-link_Mri_with_lXmp.diff
 Patch1:         xbae-4.60.4-multilib.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2:         xbae-configure-c99.patch
+Patch3:         pointer-types.patch
 
-%if 0%{?monolithic_X}
-# this could certainly be left out since it is an openmotif-devel 
-# dependency, but it is also a direct dependency
-BuildRequires:  xorg-x11-devel
-%else
+BuildRequires: make
+BuildRequires:  gcc
 # libXp-devel and libXext-devel are required by openmotif-devel or
 # lesstif-devel
 BuildRequires:  libXpm-devel 
 # needed for examples
 BuildRequires:  libXmu-devel
-%endif
 
 %if 0%{?rhel}
 BuildRequires:  openmotif-devel
 %else
-BuildRequires:  lesstif-devel
+BuildRequires:  motif-devel
 # to be sure that we link against lesstif even if openmotif provides the same
 # soname
-Requires:       lesstif
+#Requires:       lesstif
 %endif
 # Wcl-devel should only needed by an example, which adds the Xbae widgets 
 # to Wcl, so there is no real need for it.
@@ -68,18 +54,13 @@ that provides generic customised data entry and formatting for strings.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 %if 0%{?rhel}
 Requires:       openmotif-devel 
 %else
-Requires:       lesstif-devel 
+Requires:       motif-devel
 %endif
-%if 0%{?monolithic_X}
-Requires:       xorg-x11-devel
-%else
 Requires:       libXpm-devel
-%endif
 # for the aclocal directory
 Requires:       automake
 Provides:       Xbae-devel = %{version}-%{release}
@@ -92,8 +73,10 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1 -b .multilib
+%patch -P 0 -p1
+%patch -P 1 -p1 -b .multilib
+%patch -P 2 -p1
+%patch -P 3 -p0
 
 for file in COPYING ChangeLog NEWS; do
  iconv -f latin1 -t utf8 < $file > $file.utf8
@@ -103,6 +86,7 @@ done
 
 
 %build
+export CFLAGS="$CFLAGS -std=gnu17"
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -165,22 +149,15 @@ mkdir __dist_code_examples
 mv __dist_examples __dist_code_examples/code_examples
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS COPYING README
 %{_libdir}/libXbae.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc __dist_Xbae-docs/* __dist_code_examples/code_examples
 %{_includedir}/Xbae/
 %{_libdir}/libXbae.so
@@ -189,38 +166,4 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.60.4-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Sep 20 2008 Patrice Dumas <pertusus@free.fr> 4.60.4-10
-- use %%patch0 instead of %%patch (#463002)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.60.4-9
-- Autorebuild for GCC 4.3
-
-* Wed Aug 22 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-8
-- fix license and source url
-
-* Wed Jul 25 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-7
-- add rhel conditionals
-
-* Sat May 12 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-6
-- keep timestamps
-- examples/builderXcessory is arch specific
-
-* Sun Dec 10 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-5
-- Requires automake is for -devel (#219047)
-
-* Sat Sep  9 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-4
-- add BuildRequires libXmu-devel for examples
-
-* Thu Aug 31 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-3
-- rebuild against lesstif
-- add Obsolete/Provides for Xbae
-
-* Fri Aug 25 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-2
-- remove dependency on Wcl-devel (was only of use for an example)
-- clean docs
-
-* Thu May 18 2006 Patrice Dumas <pertusus@free.fr> 4.60.4-1
-- Packaged for fedora extras
+%autochangelog