Hello community, here is the log from the commit of package redeclipse for openSUSE:Factory checked in at 2020-09-25 16:27:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/redeclipse (Old) and /work/SRC/openSUSE:Factory/.redeclipse.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redeclipse" Fri Sep 25 16:27:28 2020 rev:4 rq:822936 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/redeclipse/redeclipse.changes 2017-03-24 02:20:07.988980753 +0100 +++ /work/SRC/openSUSE:Factory/.redeclipse.new.4249/redeclipse.changes 2020-09-25 16:28:57.387753338 +0200 @@ -1,0 +2,33 @@ +Fri Jul 24 15:44:38 UTC 2020 - Michel Normand <[email protected]> + +- Add _constraints with default min 9GB disk space + +------------------------------------------------------------------- +Mon Jun 22 20:23:56 UTC 2020 - Mathias Homann <[email protected]> + +- Fixes according to https://build.opensuse.org/request/show/816099: +- spec file formatting +- server as separate package for openSUSE as well + +------------------------------------------------------------------- +Fri Jun 19 13:41:46 UTC 2020 - Mathias Homann <[email protected]> + +- Fixes according to https://build.opensuse.org/request/show/814881 +- sqlite patch is still needed after all + +------------------------------------------------------------------- +Tue Jun 16 10:30:10 UTC 2020 - Mathias Homann <[email protected]> + +- modified spec file to build on Fedora 31+32 +- server binary in separate package on Fedora 31+32 + +------------------------------------------------------------------- +Tue Jun 16 08:08:01 UTC 2020 - Mathias Homann <[email protected]> + +- Update to 2.0.0 +- removed system_sqlite.patch because it itn't needed anymore - the source + always uses the system sqlite libs now. +- rebased windowed-by-default.patch +- game now uses the tesseract engine instead of cube 2 + +------------------------------------------------------------------- Old: ---- redeclipse_1.5.6_nix.tar.bz2 New: ---- _constraints redeclipse_2.0.0_nix.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redeclipse.spec ++++++ --- /var/tmp/diff_new_pack.wWzycC/_old 2020-09-25 16:29:34.883786531 +0200 +++ /var/tmp/diff_new_pack.wWzycC/_new 2020-09-25 16:29:34.891786538 +0200 @@ -1,7 +1,7 @@ # # spec file for package redeclipse # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,62 +12,63 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: redeclipse -Version: 1.5.6 +Version: 2.0.0 Release: 0 Summary: Fast-paced first person ego shooter -License: Zlib and CC-BY-SA-3.0 +License: Zlib AND CC-BY-SA-3.0 Group: Amusements/Games/3D/Shoot -Url: http://www.redeclipse.net/ -# Sadly not source URL compatible http://www.indiedb.com/games/red-eclipse/downloads/red-eclipse-v155-elysium-edition-for-linux -Source: %{name}_%{version}_nix.tar.bz2 -# Patches from PlayDeb -Patch1: windowed-by-default.patch -Patch2: system_sqlite.patch -BuildRequires: c++_compiler +URL: http://www.redeclipse.net/ +Source: https://github.com/redeclipse/base/releases/download/v%{version}/%{name}_%{version}_nix.tar.bz2 + +Patch0: windowed-by-default.patch +Patch1: system_sqlite.patch + +BuildRequires: SDL2-devel +BuildRequires: ed BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(SDL2_mixer) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libenet) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) -# This is needed by the Makefile -BuildRequires: ed + Requires: %{name}-data >= %{version} %description -The game is a new take on the first person arena shooter, built as a -total conversion of Cube Engine 2 (Sauerbraten), which lends itself -toward a balanced gameplay, with a general theme of agility in a -variety of environments. -The game is centered on multiplayer based action, but can also be -played offline against bots. +Red Eclipse 2 is a first person shooter based on the tesseract engine. +Parkour gameplay, different game modes, and several mutators to make the game very flexible. +Map editor is included. %package data Summary: Data files for the Red Eclipse game Group: Amusements/Games/3D/Shoot -Requires: %{name} >= %{version} BuildArch: noarch %description data -The game is a new take on the first person arena shooter, built as a -total conversion of Cube Engine 2 (Sauerbraten), which lends itself -toward a balanced gameplay, with a general theme of agility in a -variety of environments. +This package contains the data files (maps, models, textures, sounds, etc.) for the Red Eclipse game. + +%package server +Summary: The Red Eclipse server binary +Group: Amusements/Games/3D/Shoot +Requires: %{name}-data >= %{version} -This package contains the data files (maps, models, textures, sounds, etc.) -for the Red Eclipse game. +%description server +This package contains the server binary for the Red Eclipse game. %prep %setup -q +%patch0 -p1 %patch1 -p1 -%patch2 -p1 rm -r src/enet/ rm -r src/include/ @@ -105,20 +106,29 @@ %files %defattr(-,root,root) +%license doc/license.txt %doc readme.txt doc/*.txt %doc %{_defaultdocdir}/%{name}/examples/ %{_bindir}/%{name} -%{_bindir}/%{name}-server + %{_libexecdir}/%{name} %{_datadir}/applications/* %{_datadir}/icons/* %dir %{_datadir}/appdata %{_datadir}/appdata/*.appdata.xml -%{_mandir}/man6/%{name}-server.6.* %{_mandir}/man6/%{name}.6.* %files data %defattr(-,root,root) +%license doc/license.txt %{_datadir}/%{name} +%files server +%license doc/license.txt +%{_bindir}/%{name}-server +%{_mandir}/man6/%{name}-server.6.* +%{_libexecdir}/%{name}/config +%{_libexecdir}/%{name}/data +%{_libexecdir}/%{name}/config + %changelog ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">9</size> </disk> </hardware> </constraints> ++++++ redeclipse_1.5.6_nix.tar.bz2 -> redeclipse_2.0.0_nix.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/redeclipse/redeclipse_1.5.6_nix.tar.bz2 /work/SRC/openSUSE:Factory/.redeclipse.new.4249/redeclipse_2.0.0_nix.tar.bz2 differ: char 11, line 1 ++++++ system_sqlite.patch ++++++ --- /var/tmp/diff_new_pack.wWzycC/_old 2020-09-25 16:29:34.967786606 +0200 +++ /var/tmp/diff_new_pack.wWzycC/_new 2020-09-25 16:29:34.967786606 +0200 @@ -1,65 +1,65 @@ -# use system sqlite3 -Index: redeclipse-1.5.5/src/Makefile -=================================================================== ---- redeclipse-1.5.5.orig/src/Makefile 2016-07-01 19:48:00.000000000 +0200 -+++ redeclipse-1.5.5/src/Makefile 2016-07-01 21:07:49.223921890 +0200 -@@ -83,7 +83,7 @@ +diff -burNE redeclipse-2.0.0_orig/src/Makefile redeclipse-2.0.0/src/Makefile +--- redeclipse-2.0.0_orig/src/Makefile 2020-06-19 15:54:22.107742036 +0200 ++++ redeclipse-2.0.0/src/Makefile 2020-06-19 16:06:07.191461674 +0200 +@@ -118,7 +118,7 @@ endif endif - CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` --CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL -+CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL -lsqlite3 + CLIENT_INCLUDES= $(INCLUDES) `$(PKG_CONFIG) --cflags x11 sdl2 SDL2_image SDL2_mixer zlib gl` +-CLIENT_LIBS= -Lenet -lenet `$(PKG_CONFIG) --libs x11 sdl2 SDL2_image SDL2_mixer zlib gl` ++CLIENT_LIBS= -Lenet -lenet `$(PKG_CONFIG) --libs x11 sdl2 SDL2_image SDL2_mixer zlib gl` -lsqlite3 + ifneq (,$(WANT_STEAM)) + override CLIENT_LIBS+= -L../bin/$(PLATFORM_BIN) -lsteam_api endif - ifneq (,$(findstring linux,$(PLATFORM))) - CLIENT_LIBS+= -lrt -@@ -99,7 +99,6 @@ - shared/stream.o \ +@@ -143,7 +143,6 @@ shared/tools.o \ shared/zip.o \ + support/jsmn.o \ - support/sqlite3.o \ + engine/aa.o \ engine/bih.o \ engine/blend.o \ - engine/blob.o \ -@@ -161,7 +160,7 @@ - SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINDLL) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm - else - SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) --SERVER_LIBS= -Lenet -lenet -lz -+SERVER_LIBS= -Lenet -lenet -lz -lsqlite3 +@@ -216,7 +215,7 @@ endif - SERVER_OBJS= \ - shared/crypto-standalone.o \ -@@ -169,7 +168,6 @@ - shared/stream-standalone.o \ + else + SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) `pkg-config --cflags zlib` +-SERVER_LIBS= -Lenet -lenet `pkg-config --libs zlib` ++SERVER_LIBS= -Lenet -lenet `pkg-config --libs zlib` -lsqlite3 + CTFONT_INCLUDES= -DSTANDALONE `pkg-config --cflags zlib freetype2` + CTFONT_LIBS= `pkg-config --libs zlib freetype2` + ifneq (,$(WANT_STEAM)) +@@ -230,7 +229,6 @@ shared/tools-standalone.o \ shared/zip-standalone.o \ + support/jsmn.o \ - support/sqlite3.o \ + engine/cdpi-standalone.o \ engine/command-standalone.o \ - engine/irc-standalone.o \ - engine/master-standalone.o \ -@@ -205,9 +203,6 @@ + engine/http-standalone.o \ +@@ -272,9 +270,6 @@ %-standalone.o: %.cpp $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@) -support/sqlite3.o: support/sqlite3.c - $(CC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -c -o support/sqlite3.o support/sqlite3.c - - $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES) - $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH)) - $(filter engine/%,$(CLIENT_OBJS)): $(filter engine/%,$(CLIENT_PCH)) -@@ -387,7 +382,6 @@ - engine/master.o: shared/glemu.h shared/iengine.h shared/igame.h engine/irc.h - engine/master.o: engine/sound.h engine/world.h engine/octa.h - engine/master.o: engine/lightmap.h engine/bih.h engine/texture.h + support/jsmn.o: support/jsmn.c + $(CC) -c -o support/jsmn.o support/jsmn.c + +@@ -461,7 +456,7 @@ + engine/master.o: shared/glexts.h shared/glemu.h shared/iengine.h + engine/master.o: shared/igame.h engine/http.h engine/irc.h engine/sound.h engine/world.h + engine/master.o: engine/octa.h engine/light.h engine/texture.h engine/bih.h -engine/master.o: engine/model.h support/sqlite3.h - engine/material.o: engine/engine.h engine/version.h shared/cube.h shared/tools.h - engine/material.o: shared/command.h shared/geom.h shared/ents.h - engine/material.o: shared/glexts.h shared/glemu.h shared/iengine.h -@@ -682,7 +676,6 @@ ++engine/master.o: engine/model.h + engine/material.o: engine/engine.h engine/version.h shared/cube.h + engine/material.o: shared/tools.h shared/command.h shared/geom.h + engine/material.o: shared/ents.h shared/glexts.h shared/glemu.h +@@ -770,7 +765,7 @@ engine/master-standalone.o: engine/engine.h engine/version.h shared/cube.h engine/master-standalone.o: shared/tools.h shared/command.h shared/geom.h engine/master-standalone.o: shared/ents.h shared/iengine.h shared/igame.h --engine/master-standalone.o: engine/irc.h engine/sound.h support/sqlite3.h +-engine/master-standalone.o: engine/http.h engine/irc.h engine/sound.h support/sqlite3.h ++engine/master-standalone.o: engine/http.h engine/irc.h engine/sound.h engine/server-standalone.o: engine/engine.h engine/version.h shared/cube.h engine/server-standalone.o: shared/tools.h shared/command.h shared/geom.h engine/server-standalone.o: shared/ents.h shared/iengine.h shared/igame.h ++++++ windowed-by-default.patch ++++++ --- /var/tmp/diff_new_pack.wWzycC/_old 2020-09-25 16:29:34.979786616 +0200 +++ /var/tmp/diff_new_pack.wWzycC/_new 2020-09-25 16:29:34.979786616 +0200 @@ -1,22 +1,12 @@ -Description: Start in windowed mode by default - Debian Games team has a preference for games starting in windowed mode, since - fullscreen SDL will capture all keyboard input and make the user unable to - escape via alt-tab, change volume, or exit sanely in the case of the - application locking up. -Forwarded: not-needed -Author: Martin Erik Werner <[email protected]> -Last-Update: 2011-12-13 - -Index: redeclipse-1.5.5/src/engine/main.cpp -=================================================================== ---- redeclipse-1.5.5.orig/src/engine/main.cpp 2016-06-30 21:36:13.797866688 +0200 -+++ redeclipse-1.5.5/src/engine/main.cpp 2016-06-30 21:36:13.793866635 +0200 -@@ -235,7 +235,7 @@ - } +diff -burNE redeclipse-2.0.0_vanilla/src/engine/main.cpp redeclipse-2.0.0/src/engine/main.cpp +--- redeclipse-2.0.0_vanilla/src/engine/main.cpp 2020-06-16 10:23:21.249977623 +0200 ++++ redeclipse-2.0.0/src/engine/main.cpp 2020-06-16 10:25:03.533664683 +0200 +@@ -246,7 +246,7 @@ + wantdisplaysetup = true; } --VARF(0, fullscreen, 0, 1, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); -+VARF(0, fullscreen, 0, 0, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); +-VARF(IDF_INIT, fullscreen, 0, 1, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); ++VARF(IDF_INIT, fullscreen, 0, 0, 1, if(!(identflags&IDF_WORLD)) setfullscreen(fullscreen!=0)); void resetfullscreen() {
