Drop ix86 on F45 unavoidably as imake stopped supporting on ix86

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,3 @@
 xmountains_2.8.tar.gz
 /xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz
+/xmountains-2.11.tar.gz

sources

@@ -1 +1 @@
-SHA512 (xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz) = fde76ed5dc4461617e548b729d45ddcac186d3078c55837abb5d2629caeaf6b42399dbd34d583583ff5a70f0fb88b67f7a10b66c0649cf435f8630028f1c5115
+SHA512 (xmountains-2.11.tar.gz) = 0c9f9d66d6288ad1bdbc76b0bc35f66f9baa3842da2fd55a434ee9e52d6ac18deb1fb3930456ad45422074814657008471edde5ac42b628b843adf4b794efd33

xmountains-2.11-c23.patch

@@ -0,0 +1,61 @@
+diff --git a/X_graphics.c b/X_graphics.c
+index 3b5d7b2..ceef856 100644
+--- a/X_graphics.c
++++ b/X_graphics.c
+@@ -80,8 +80,7 @@ TRUE,
+ void finish_artist();
+ 
+ /*{{{void zap_events(int snooze)*/
+-void zap_events(snooze)
+-int snooze;
++void zap_events()
+ {
+   XEvent event;
+   XExposeEvent *expose = (XExposeEvent *)&event;
+@@ -427,7 +426,7 @@ Gun *blue;
+     XMapWindow(dpy, win );
+   }
+   XClearWindow(dpy,win);
+-  zap_events(0);
++  zap_events();
+   
+   gptr->graph_width = graph_width;
+   gptr->graph_height = graph_height;
+diff --git a/xmountains.c b/xmountains.c
+index 6968b92..108b492 100644
+--- a/xmountains.c
++++ b/xmountains.c
+@@ -5,6 +5,7 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <X11/Xlib.h>
+ #include "crinkle.h"
+ #include "paint.h"
+ #include "patchlevel.h"
+@@ -78,7 +79,6 @@ int my_getopt (int argc, char **argv, char *pat)
+ }
+ /* }}} */
+ 
+-double atof();
+ #ifdef ANSI
+ void init_graphics (int, Window, int,int, Graph *, Gun *, Gun *, Gun *);
+ void clear_col( int );
+@@ -95,7 +95,7 @@ void scroll_screen ();
+ void zap_events();
+ #endif
+ 
+-void finish_prog();
++void finish_prog(int);
+ 
+ int s_height=768, s_width=1024;
+ int mapwid;
+@@ -483,7 +483,7 @@ int main (int argc, char **argv)
+     
+ extern int quit_xmount;
+ 
+-void finish_prog()
++void finish_prog(int)
+ {
+   /* The next time zap_events is called the program will quit */
+   quit_xmount=TRUE;

xmountains.spec

@@ -1,39 +1,30 @@
-%global         usegit      1
-%global         mainrel     3
-
-%global         githash     3ba444a4f7a6835e4a717c46f95802faea03eaf5
-%global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
-%global         gitdate     Tue, 3 Jan 2017 08:25:51 +0000
-%global         gitdate_num 20170103
-
-%if 0%{?usegit} >= 1
-%global         fedorarel   %{mainrel}.D%{gitdate_num}git%{shorthash}
-%else
-%global         fedorarel   %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
-%endif
-
 Name:           xmountains
-Version:        2.9
-Release:        %{fedorarel}%{?dist}.1
+Version:        2.11
+Release:        8%{?dist}
 Summary:        A fractal terrain generator
 
-Group:          Amusements/Graphics
-License:        MIT
+# SPDX confirmed
+License:        HPND
 URL:            https://spbooth.github.io/xmountains/
-%if 0%{?usegit} >= 1
-Source0:        https://github.com/spbooth/xmountains/archive/%{githash}/%{name}_%{version}-D%{gitdate_num}git%{githash}.tar.gz
-%else
-Source0:        http://www2.epcc.ed.ac.uk/~spb/xmountains/xmountains_%{version}.tar.gz
-%endif
+Source0:        https://github.com/spbooth/xmountains/archive/v%{version}/%{name}-%{version}.tar.gz
 Source11:        xscreensaver-xmountains.xml
 Source12:        xscreensaver-xmountains.conf
+# Need report to the upstream
+# Fix for C23
+Patch0:         xmountains-2.11-c23.patch
 
+BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  xorg-x11-xbitmaps
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  libX11-devel
 BuildRequires:  imake
 
+%if 0%{?fedora} >= 45
+# imake not available on i686
+ExcludeArch:	%{ix86}
+%endif
+
 %description
 Xmountains is a fractal terrain generator written by Stephen Booth.
 
@@ -49,15 +40,14 @@ This package adds XScreenSaver integration.
 
 
 %prep
-%if 0%{?usegit} >= 1
-%setup -q -n xmountains-%{githash}
-%else
-%setup -q -c
-%endif
+%setup -q
+%patch -P0 -p1 -b .c23
+
+%global optflags %optflags -Werror=implicit-function-declaration
 
 %build
 xmkmf
-make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -DANSI"
 
 %install
 make install \
@@ -94,6 +84,73 @@ fi
 %{_datadir}/xscreensaver/*/*
 
 %changelog
+* Sat Jul 18 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-8
+- Drop ix86 on F45 unavoidably as imake stopped supporting on ix86
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-3
+- Port to C23
+
+* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-2
+- use C17 for now
+
+* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-1
+- 2.11
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-8.D20170103git3ba444a4f7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Mar 22 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9-7.D20170103git3ba444a4f7
+- SPDX migration
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-6.D20170103git3ba444a4f7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9-5.D20170103git3ba444a4f7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Feb  2 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9-4.D20170103git3ba444a4f7
+- Compile with -Werror=implicit-function-declaration
+- Support gcc10 -fno-common
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3.D20170103git3ba444a4f7.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3.D20170103git3ba444a4f7.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3.D20170103git3ba444a4f7.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-3.D20170103git3ba444a4f7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild