Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icebreaker for openSUSE:Factory checked in at 2022-03-26 22:31:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icebreaker (Old) and /work/SRC/openSUSE:Factory/.icebreaker.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icebreaker" Sat Mar 26 22:31:11 2022 rev:4 rq:965024 version:2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icebreaker/icebreaker.changes 2021-11-03 17:27:14.137369044 +0100 +++ /work/SRC/openSUSE:Factory/.icebreaker.new.1900/icebreaker.changes 2022-03-26 22:31:26.277984194 +0100 @@ -1,0 +2,8 @@ +Sun Mar 20 06:26:51 UTC 2022 - Carsten Ziepke <kiel...@gmail.com> + +- Add icebreaker-makefile-fix.patch, fixes unterminated call to + function 'shell' in makefile for openSUSE Leap and use $(CC) + instead hardcoded gcc +- Fix building for openSUSE Leap, using gcc10-c++ + +------------------------------------------------------------------- New: ---- icebreaker-makefile-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icebreaker.spec ++++++ --- /var/tmp/diff_new_pack.AGae5e/_old 2022-03-26 22:31:26.797984906 +0100 +++ /var/tmp/diff_new_pack.AGae5e/_new 2022-03-26 22:31:26.801984911 +0100 @@ -1,7 +1,7 @@ # # spec file for package icebreaker # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,9 +24,17 @@ Group: Amusements/Games/Board/Puzzle URL: http://www.mattdm.org/icebreaker/ Source: https://mattdm.org/icebreaker/2.2.x/icebreaker-%{version}.tar.xz +# PATCH-FIX-OPENSUSE icebreaker-makefile-fix.patch - fixes unterminated call to function 'shell' in makefile for openSUSE Leap and use $(CC) instead hardcoded gcc +Patch1: icebreaker-makefile-fix.patch BuildRequires: desktop-file-utils +BuildRequires: pkgconfig BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(sdl) +%if 0%{?suse_version} <= 1500 +BuildRequires: gcc10 +%else +BuildRequires: gcc +%endif %description IceBreaker is an action-puzzle game in which the player must section @@ -37,8 +45,14 @@ %prep %setup -q +%patch1 -p1 %build +%if 0%{?suse_version} <= 1500 +export CC=gcc-10 +%else +export CC=gcc +%endif %make_build OPTIMIZE="%{optflags}" prefix=%{_prefix} %install ++++++ icebreaker-makefile-fix.patch ++++++ diff -Nur icebreaker-2.2.1.orig/Makefile icebreaker-2.2.1/Makefile --- icebreaker-2.2.1.orig/Makefile 2021-10-02 20:47:24.000000000 +0200 +++ icebreaker-2.2.1/Makefile 2022-03-20 07:44:13.509204236 +0100 @@ -1,4 +1,4 @@ -CC=gcc +# CC=gcc PKG_CONFIG ?= pkg-config @@ -33,7 +33,7 @@ SDL_LIB=$(SDL_MIXER) $(SDL_LDFLAGS) SDL_CFLAGS := $(shell $(PKG_CONFIG) sdl --cflags) SDL_LDFLAGS := $(shell $(PKG_CONFIG) sdl --libs) -VERSION := $(shell awk '/^#define VERSION/ { print $$3 }' icebreaker.h) +VERSION := $(shell awk '/^\#define VERSION/ { print $$3 }' icebreaker.h) VERDATE := $(shell LC_ALL=C date -u -r icebreaker.h +"%d %B %Y") WINARCH=i686
