From f39334fe57732ce1b2d70f5ccf0e4813cd53a9e310a1098e4f76bad57e626605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 25 Dec 2018 15:38:12 +0000 Subject: [PATCH 1/3] Accepting request 660014 from home:anicka:branches:games - remove last patch, as package builds and runs without it and forced autoreconf breaks correct setting of datadir Fix for #1114591. OBS-URL: https://build.opensuse.org/request/show/660014 OBS-URL: https://build.opensuse.org/package/show/games/fillets-ng?expand=0&rev=37 --- fillets-ng-use-lua-5.1.pc.patch | 13 ------------- fillets-ng.changes | 7 +++++++ fillets-ng.spec | 19 ++----------------- 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 fillets-ng-use-lua-5.1.pc.patch diff --git a/fillets-ng-use-lua-5.1.pc.patch b/fillets-ng-use-lua-5.1.pc.patch deleted file mode 100644 index 3e467f9..0000000 --- a/fillets-ng-use-lua-5.1.pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: fillets-ng-1.0.1/configure.in -=================================================================== ---- fillets-ng-1.0.1.orig/configure.in -+++ fillets-ng-1.0.1/configure.in -@@ -42,7 +42,7 @@ dnl Debian, and possibly other systems, - LUA_CFLAGS="`[$LUACONFIG --include]`" - LUA_LIBS="`[$LUACONFIG --static]`" - else dnl ...otherwise, attempt to guess -- PKG_CHECK_MODULES(LUA, lua, [], [ -+ PKG_CHECK_MODULES(LUA, lua-5.1, [], [ - LUA_CFLAGS="" - LUA_LIBS="" - AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua", diff --git a/fillets-ng.changes b/fillets-ng.changes index 2e86670..51c7a2b 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 19 12:53:08 UTC 2018 - anicka@suse.com + +- remove last patch, as package builds and runs without it + and forced autoreconf breaks correct setting of datadir + Fix for #1114591. + ------------------------------------------------------------------- Wed Nov 18 13:33:01 UTC 2015 - dimstar@opensuse.org diff --git a/fillets-ng.spec b/fillets-ng.spec index 6e5b179..8aecd4b 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -1,7 +1,7 @@ # # spec file for package fillets-ng # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,26 +20,20 @@ Name: fillets-ng Version: 1.0.1 Release: 0 Summary: Fish Fillets - Next Generation -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/Action/Arcade Url: http://fillets.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fillets/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png Patch0: %{name}-0.9.3-datadir.patch -Patch1: %{name}-use-lua-5.1.pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_ttf-devel BuildRequires: fribidi-devel BuildRequires: gcc-c++ -BuildRequires: libtool -%if 0%{?suse_version} < 1220 -BuildRequires: lua-devel -%else BuildRequires: lua51-devel -%endif BuildRequires: pkgconfig BuildRequires: update-desktop-files Requires: %{name}-data = %{version} @@ -54,17 +48,8 @@ your fish. The whole game is accompanied by quiet, comforting music. %prep %setup -q %patch0 -if [ -e %{_libdir}/pkgconfig/lua-5.1.pc ]; then -# Only apply the patch if there is a lua-5.1.pc file.. this is a special case -# as the file originally was called lua.pc, but renamed in Tumbleweed for co-existence -# with newer lua version. Only conditionally applying the patch makes sure we do not -# break build for older releases -%patch1 -p1 -fi %build -# Needed for patch1 -autoreconf -fiv %configure make %{?_smp_mflags} From bc7b9d82069f8f387d14738d89de96b0b22b18bfb04e2b8f408c7e0f46d2967b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 13 Jan 2019 15:30:53 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/games/fillets-ng?expand=0&rev=38 --- fillets-ng.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fillets-ng.changes b/fillets-ng.changes index 51c7a2b..cfc5e07 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,6 +1,13 @@ ------------------------------------------------------------------- Wed Dec 19 12:53:08 UTC 2018 - anicka@suse.com +- remove fillets-use-lua-5.1.pc.patch, as package builds and runs + without it and forced autoreconf breaks correct setting of datadir + Fix for bos#1114591. + +------------------------------------------------------------------- +Wed Dec 19 12:53:08 UTC 2018 - anicka@suse.com + - remove last patch, as package builds and runs without it and forced autoreconf breaks correct setting of datadir Fix for #1114591. From d3aba1e405a57425473a6e1e1689d3542cfa34826f26a8ea5088f6d6b5a4f2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 13 Jan 2019 15:32:21 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/games/fillets-ng?expand=0&rev=39 --- fillets-ng.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fillets-ng.changes b/fillets-ng.changes index cfc5e07..a7abcf5 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Wed Dec 19 12:53:08 UTC 2018 - anicka@suse.com -- remove fillets-use-lua-5.1.pc.patch, as package builds and runs +- Remove fillets-use-lua-5.1.pc.patch, as package builds and runs without it and forced autoreconf breaks correct setting of datadir - Fix for bos#1114591. + Fix for boo#1114591. ------------------------------------------------------------------- Wed Dec 19 12:53:08 UTC 2018 - anicka@suse.com