diff --git a/fillets-ng-use-lua-5.1.pc.patch b/fillets-ng-use-lua-5.1.pc.patch new file mode 100644 index 0000000..3e467f9 --- /dev/null +++ b/fillets-ng-use-lua-5.1.pc.patch @@ -0,0 +1,13 @@ +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 683b88e..2e86670 100644 --- a/fillets-ng.changes +++ b/fillets-ng.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 18 13:33:01 UTC 2015 - dimstar@opensuse.org + +- Add fillets-ng-use-lua-5.1.pc.patch: detect lua-5.1.pc; fixes + build on current TW setups. +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + ------------------------------------------------------------------- Mon Apr 13 18:47:37 UTC 2015 - dimstar@opensuse.org diff --git a/fillets-ng.spec b/fillets-ng.spec index 76615d3..6e5b179 100644 --- a/fillets-ng.spec +++ b/fillets-ng.spec @@ -27,12 +27,14 @@ Source0: http://prdownloads.sourceforge.net/fillets/%{name}-%{version}.ta 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 @@ -52,8 +54,17 @@ 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}