From 65a3ddb35ed181f7d08bb0de889143c422b149da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:45:40 +0000 Subject: [PATCH 01/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 97a6dae..df5e179 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -14,7 +14,7 @@ Name: xmountains Version: 2.9 -Release: %{fedorarel}%{?dist}.2 +Release: %{fedorarel}%{?dist}.3 Summary: A fractal terrain generator License: MIT @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From eb76c433eac4f616ce0cf0cd6d69c03ee1151722 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:18:24 +0000 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index df5e179..1370591 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -14,7 +14,7 @@ Name: xmountains Version: 2.9 -Release: %{fedorarel}%{?dist}.3 +Release: %{fedorarel}%{?dist}.4 Summary: A fractal terrain generator License: MIT @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ca55f7807a2bf708782474290daa15d26de1c116 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:20:26 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 1370591..6036c4b 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -14,7 +14,7 @@ Name: xmountains Version: 2.9 -Release: %{fedorarel}%{?dist}.4 +Release: %{fedorarel}%{?dist}.5 Summary: A fractal terrain generator License: MIT @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9fea20afc674716f16e5c2066ae10b5806f6531f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:40:42 +0000 Subject: [PATCH 04/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 6036c4b..97d04dc 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -14,7 +14,7 @@ Name: xmountains Version: 2.9 -Release: %{fedorarel}%{?dist}.5 +Release: %{fedorarel}%{?dist}.6 Summary: A fractal terrain generator License: MIT @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6ae539d321d4737e311828cd68649622d5e7facb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:45:49 +0900 Subject: [PATCH 05/18] rename release macro to make rpmdev-bumprelease work --- xmountains.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index 97d04dc..a69baba 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -7,14 +7,14 @@ %global gitdate_num 20170103 %if 0%{?usegit} >= 1 -%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash} +%global baserelease %{mainrel}.D%{gitdate_num}git%{shorthash} %else -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif Name: xmountains Version: 2.9 -Release: %{fedorarel}%{?dist}.6 +Release: %{baserelease}%{?dist}.6 Summary: A fractal terrain generator License: MIT From 029331bd62968db59e80e9bd2ad0a959c72e8b8a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:25:35 +0900 Subject: [PATCH 06/18] fix baserelease usage --- xmountains.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index a69baba..36aafee 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,5 +1,5 @@ %global usegit 1 -%global mainrel 4 +%global baserelease 4 %global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -7,14 +7,14 @@ %global gitdate_num 20170103 %if 0%{?usegit} >= 1 -%global baserelease %{mainrel}.D%{gitdate_num}git%{shorthash} +%global fedorarel %{baserelease}.D%{gitdate_num}git%{shorthash} %else -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif Name: xmountains Version: 2.9 -Release: %{baserelease}%{?dist}.6 +Release: %{fedorarel}%{?dist} Summary: A fractal terrain generator License: MIT From e8e7a88c0364404f12ea79173e14b3cdee195051 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jul 2023 00:41:08 +0900 Subject: [PATCH 07/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild --- xmountains.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index 36aafee..15e18e7 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,5 +1,5 @@ %global usegit 1 -%global baserelease 4 +%global baserelease 5 %global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -58,8 +58,8 @@ This package adds XScreenSaver integration. %else %setup -q -c %endif -%patch1 -p1 -b .implicit -%patch2 -p1 -b .fnocommon +%patch -P1 -p1 -b .implicit +%patch -P2 -p1 -b .fnocommon %global optflags %optflags -Werror=implicit-function-declaration @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jul 22 2023 Mamoru TASAKA - 2.9-5.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 14c4ee8979d8b73c857b935fff43956063b2085b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:55:18 +0000 Subject: [PATCH 08/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 15e18e7..318eaab 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,5 +1,5 @@ %global usegit 1 -%global baserelease 5 +%global baserelease 6 %global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -102,6 +102,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.9-6.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Mamoru TASAKA - 2.9-5.D20170103git3ba444a4f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e4da3788db48a3eda9f44c035721a6a858ceca02 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Mar 2024 23:32:17 +0900 Subject: [PATCH 09/18] SPDX migration --- xmountains.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index 318eaab..8430cbc 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,5 +1,5 @@ %global usegit 1 -%global baserelease 6 +%global baserelease 7 %global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -17,7 +17,8 @@ Version: 2.9 Release: %{fedorarel}%{?dist} Summary: A fractal terrain generator -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 @@ -31,7 +32,7 @@ Patch1: xmountains-2.9-implicit.patch # Support gcc10 -fno-common Patch2: xmountains-2.9-fno-common.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: xorg-x11-xbitmaps BuildRequires: xorg-x11-proto-devel @@ -102,6 +103,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Mar 22 2024 Mamoru TASAKA - 2.9-7.D20170103git3ba444a4f7 +- SPDX migration + * Sat Jan 27 2024 Fedora Release Engineering - 2.9-6.D20170103git3ba444a4f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e3d2d45bdc78d660896db7a29e2f0eba67c52d19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:16:07 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 8430cbc..dc1c4d7 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,5 +1,5 @@ %global usegit 1 -%global baserelease 7 +%global baserelease 8 %global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 %global shorthash %(TMP=%githash ; echo ${TMP:0:10}) @@ -103,6 +103,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.9-8.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Mar 22 2024 Mamoru TASAKA - 2.9-7.D20170103git3ba444a4f7 - SPDX migration From cde2d62321564cc01fcfb41d7ca79c681f8163a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Jan 2025 21:15:11 +0900 Subject: [PATCH 11/18] 2.11 --- .gitignore | 1 + sources | 2 +- xmountains-2.9-fno-common.patch | 11 ---------- xmountains-2.9-implicit.patch | 18 --------------- xmountains.spec | 39 ++++++--------------------------- 5 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 xmountains-2.9-fno-common.patch delete mode 100644 xmountains-2.9-implicit.patch diff --git a/.gitignore b/.gitignore index 323fe9b..b797dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmountains_2.8.tar.gz /xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz +/xmountains-2.11.tar.gz diff --git a/sources b/sources index 4cbf332..59fa754 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz) = fde76ed5dc4461617e548b729d45ddcac186d3078c55837abb5d2629caeaf6b42399dbd34d583583ff5a70f0fb88b67f7a10b66c0649cf435f8630028f1c5115 +SHA512 (xmountains-2.11.tar.gz) = 0c9f9d66d6288ad1bdbc76b0bc35f66f9baa3842da2fd55a434ee9e52d6ac18deb1fb3930456ad45422074814657008471edde5ac42b628b843adf4b794efd33 diff --git a/xmountains-2.9-fno-common.patch b/xmountains-2.9-fno-common.patch deleted file mode 100644 index 330ace2..0000000 --- a/xmountains-2.9-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmountains-2.9/xmountains.c.fnocommon 2020-02-02 09:59:17.097612406 +0900 -+++ xmountains-2.9/xmountains.c 2020-02-02 10:13:25.882374425 +0900 -@@ -17,7 +17,7 @@ - char scroll_Id[]="$Id: xmountains.c,v 1.43 2010/12/17 09:25:36 spb Exp $"; - extern Graph g; - Parm fold_param; --char *display; -+extern char *display; - extern char *geom; - - extern int swosh; diff --git a/xmountains-2.9-implicit.patch b/xmountains-2.9-implicit.patch deleted file mode 100644 index 8f265a9..0000000 --- a/xmountains-2.9-implicit.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xmountains-2.9/xmountains.c.implicit 2017-01-03 17:25:51.000000000 +0900 -+++ xmountains-2.9/xmountains.c 2020-02-02 09:59:17.097612406 +0900 -@@ -1,6 +1,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -143,6 +144,7 @@ void print_algorithm(); - void seed_uni(int ijkl); - void plot_column(Graph *g); - -+int - main (argc,argv) - int argc; - char **argv; diff --git a/xmountains.spec b/xmountains.spec index dc1c4d7..c767f29 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,36 +1,14 @@ -%global usegit 1 -%global baserelease 8 - -%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 %{baserelease}.D%{gitdate_num}git%{shorthash} -%else -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} -%endif - Name: xmountains -Version: 2.9 -Release: %{fedorarel}%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: A fractal terrain generator # 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 -# Support -Werror=impliciti-function-declaration -Patch1: xmountains-2.9-implicit.patch -# Support gcc10 -fno-common -Patch2: xmountains-2.9-fno-common.patch BuildRequires: make BuildRequires: gcc @@ -54,13 +32,7 @@ This package adds XScreenSaver integration. %prep -%if 0%{?usegit} >= 1 -%setup -q -n xmountains-%{githash} -%else -%setup -q -c -%endif -%patch -P1 -p1 -b .implicit -%patch -P2 -p1 -b .fnocommon +%setup -q %global optflags %optflags -Werror=implicit-function-declaration @@ -103,6 +75,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-1 +- 2.11 + * Sat Jul 20 2024 Fedora Release Engineering - 2.9-8.D20170103git3ba444a4f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 51b1b2c1b0223c075790778a0e7d1270789941f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Jan 2025 22:37:46 +0900 Subject: [PATCH 12/18] Use C17 for now --- xmountains.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index c767f29..04f2ddd 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -38,7 +38,7 @@ This package adds XScreenSaver integration. %build xmkmf -make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -std=gnu17" %install make install \ @@ -75,6 +75,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-2 +- use C17 for now + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-1 - 2.11 From 2d35c0868e44cf7b2a51a5700018fbdcca4f0525 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 16 Jan 2025 01:03:40 +0900 Subject: [PATCH 13/18] Fix compilation with C23 --- xmountains-2.11-c23.patch | 61 +++++++++++++++++++++++++++++++++++++++ xmountains.spec | 11 +++++-- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 xmountains-2.11-c23.patch diff --git a/xmountains-2.11-c23.patch b/xmountains-2.11-c23.patch new file mode 100644 index 0000000..b0340d4 --- /dev/null +++ b/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 + #include + #include ++#include + #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; diff --git a/xmountains.spec b/xmountains.spec index 04f2ddd..38ad7ca 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -9,6 +9,9 @@ URL: https://spbooth.github.io/xmountains/ 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 @@ -33,12 +36,13 @@ This package adds XScreenSaver integration. %prep %setup -q +%patch -P0 -p1 -b .c23 %global optflags %optflags -Werror=implicit-function-declaration %build xmkmf -make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -std=gnu17" +make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -DANSI" %install make install \ @@ -75,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-3 +- Port to C23 + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-2 - use C17 for now From 134eb2a65581035dd9d96373a8ef2af3a7eef8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:04:28 +0000 Subject: [PATCH 14/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 38ad7ca..3d9b623 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-3 - Port to C23 From 9e78bf3f4b4f493491b2895f7b1c1b3f3dd769fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:36 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 3d9b623..43c59e2 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 17133e5e4d668d33a1876b81f12f1e111d5e900c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:47:18 +0000 Subject: [PATCH 16/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 43c59e2..6019cf3 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 86811b27c3626b045080b20095e38895e92364a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:19:57 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 6019cf3..6fd1f8d 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 6ed9da79114e283eb6180c449fa939482e414bfd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 18 Jul 2026 23:33:05 +0900 Subject: [PATCH 18/18] Drop ix86 on F45 unavoidably as imake stopped supporting on ix86 --- xmountains.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 6fd1f8d..75fd1b2 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -20,6 +20,11 @@ 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. @@ -79,6 +84,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jul 18 2026 Mamoru TASAKA - 2.11-8 +- Drop ix86 on F45 unavoidably as imake stopped supporting on ix86 + * Fri Jul 17 2026 Fedora Release Engineering - 2.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild