public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/cataclysm-dda] rawhide: - Bump to release 0.I (stable) to fix F45FTBS
@ 2026-08-15 19:57 Filipe Rosset
  0 siblings, 0 replies; only message in thread
From: Filipe Rosset @ 2026-08-15 19:57 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/cataclysm-dda
            Branch : rawhide
            Commit : 966b01754851469826a3d0cc4c57b9a15db5bd9a
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-03T16:31:29-03:00
            Stats  : +43/-10 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/cataclysm-dda/c/966b01754851469826a3d0cc4c57b9a15db5bd9a?branch=rawhide

            Log:
            - Bump to release 0.I (stable) to fix F45FTBS

Resolves: rhbz#2433900
Resolves: rhbz#2485675
Resolves: rhbz#2503811

---
diff --git a/.gitignore b/.gitignore
index 85a3341..f45d68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /Cataclysm-DDA-0.F-3.tar.gz
 /Cataclysm-DDA-0.G.tar.gz
 /Cataclysm-DDA-0.H-RELEASE.tar.gz
+/Cataclysm-DDA-0.I-RELEASE.tar.gz

diff --git a/cataclysm-dda-gcc16.patch b/cataclysm-dda-gcc16.patch
new file mode 100644
index 0000000..0ec21c4
--- /dev/null
+++ b/cataclysm-dda-gcc16.patch
@@ -0,0 +1,12 @@
+--- Cataclysm-DDA-0.I/Makefile.orig	2026-08-03 15:19:25.958798331 -0300
++++ Cataclysm-DDA-0.I/Makefile	2026-08-03 15:19:25.966231249 -0300
+@@ -116,7 +116,8 @@
+   -Wzero-as-null-pointer-constant \
+   -Wno-unknown-warning-option \
+   -Wno-dangling-reference \
+-  -Wno-c++20-compat
++  -Wno-c++20-compat \
++  -Wno-error=sfinae-incomplete
+ ifeq ($(NATIVE), emscripten)
+   # The EM_ASM macro triggers this warning.
+   WARNINGS += -Wno-gnu-zero-variadic-macro-arguments

diff --git a/cataclysm-dda.spec b/cataclysm-dda.spec
index 6eb2126..685eeee 100644
--- a/cataclysm-dda.spec
+++ b/cataclysm-dda.spec
@@ -1,15 +1,14 @@
 %global _lto_cflags %nil
 Name:           cataclysm-dda
-Version:        0.H
-Release:        6%{?dist}
+Version:        0.I
+Release:        1%{?dist}
 Summary:        Turn-based survival game set in a post-apocalyptic world
 
-# Automatically converted from old format: CC-BY-SA - review is highly recommended.
-License:        LicenseRef-Callaway-CC-BY-SA
+License:        CC-BY-SA-3.0 AND OFL-1.1 AND Apache-2.0 AND MIT AND BSD-3-Clause AND Zlib
 URL:            http://cataclysmdda.org
-# https://github.com/CleverRaven/Cataclysm-DDA/archive/refs/tags/0.H-RELEASE.tar.gz
-Source0:        Cataclysm-DDA-0.H-RELEASE.tar.gz
-Patch0:         const_compile_fix.patch
+# https://github.com/CleverRaven/Cataclysm-DDA/archive/refs/tags/0.I-RELEASE.tar.gz
+Source0:        Cataclysm-DDA-0.I-RELEASE.tar.gz
+Patch0:         cataclysm-dda-gcc16.patch
 
 # Due virtual memory exhausted and build fail
 ExcludeArch:    i686
@@ -80,12 +79,21 @@ Provides:       bundled(square)
 Provides:       bundled(Square-Smallcaps)
 Provides:       bundled(unifont-fonts) = 12.0.01
 
+# Bundled C/C++ libraries in src/third-party
+# TODO, unbundle all these dependencies
+Provides:       bundled(flatbuffers) = 1.12.0
+Provides:       bundled(ghc-filesystem) = 1.5.12
+Provides:       bundled(imgui) = 1.91.5
+Provides:       bundled(imtui)
+Provides:       bundled(pinyin)
+Provides:       bundled(zstd) = 1.5.7
+
 %description    tiles-data
 Data files for %{name}-tiles.
 
 
 %prep
-%autosetup -n Cataclysm-DDA-0.H-RELEASE -p1
+%autosetup -n Cataclysm-DDA-0.I -p1
 
 
 %build
@@ -102,6 +110,7 @@ Data files for %{name}-tiles.
     PREFIX=%{_prefix} \
     USE_HOME_DIR=1 \
     PCH=0 \
+    TESTS=0 \
     RUNTESTS=0 \
     %if %{with release_build}
     RELEASE=1 \
@@ -114,6 +123,8 @@ Data files for %{name}-tiles.
     SOUND=1 \
     TILES=1 \
     USE_HOME_DIR=1 \
+    PCH=0 \
+    TESTS=0 \
     RUNTESTS=0 \
     %if %{with release_build}
     RELEASE=1 \
@@ -126,6 +137,7 @@ Data files for %{name}-tiles.
     PREFIX=%{_prefix} \
     USE_HOME_DIR=1 \
     PCH=0 \
+    TESTS=0 \
     RUNTESTS=0 \
     %if %{with release_build}
     RELEASE=1 \
@@ -138,6 +150,8 @@ Data files for %{name}-tiles.
     SOUND=1 \
     TILES=1 \
     USE_HOME_DIR=1 \
+    PCH=0 \
+    TESTS=0 \
     RUNTESTS=0 \
     %if %{with release_build}
     RELEASE=1 \
@@ -167,6 +181,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %license LICENSE.txt
 %doc doc/* README.md CODE_OF_CONDUCT.md data/changelog.txt
 %{_bindir}/cataclysm
+%{_bindir}/zzip
 
 %files data
 %{_datadir}/%{name}/cataicon.ico
@@ -189,12 +204,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/%{name}/font/
 %{_datadir}/%{name}/fontdata.json
 %{_datadir}/%{name}/gfx/
-%{_datadir}/%{name}/help/
 %{_datadir}/%{name}/sound/
 %{_metainfodir}/*.xml
 
 
 %changelog
+* Mon Aug 03 2026 Filipe Rosset <rosset.filipe@gmail.com> - 0.I-2
+- Bump to release 0.I (stable) to fix F45FTBS
+- Resolves: rhbz#2433900
+- Resolves: rhbz#2485675
+- Resolves: rhbz#2503811
+
 * Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.H-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index c3eec3f..0567e3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Cataclysm-DDA-0.H-RELEASE.tar.gz) = c62716ec5c327cbc6976b287fc143ef7ae60df2b06ce1042568750ed003d68f63e1489f968c27a23880a0535dddbfae89e7118c1ba420bf54ec177dfb9f3cf10
+SHA512 (Cataclysm-DDA-0.I-RELEASE.tar.gz) = ac62e3a389ecff398494fd55b0856feda6e435fdc7a44db464b675d3569ef061e7d47e627798167c930acadc2ca1dac2dcc8e576e8c9303f73e756a5f5c72d03

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-15 19:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-15 19:57 [rpms/cataclysm-dda] rawhide: - Bump to release 0.I (stable) to fix F45FTBS Filipe Rosset

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox