Hello community,
here is the log from the commit of package fillets-ng for openSUSE:Factory
checked in at 2015-11-24 22:33:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fillets-ng (Old)
and /work/SRC/openSUSE:Factory/.fillets-ng.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fillets-ng"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fillets-ng/fillets-ng.changes 2015-04-15
16:22:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fillets-ng.new/fillets-ng.changes
2015-11-24 22:33:54.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 18 13:33:01 UTC 2015 - dims...@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.
+
+-------------------------------------------------------------------
New:
----
fillets-ng-use-lua-5.1.pc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fillets-ng.spec ++++++
--- /var/tmp/diff_new_pack.ABHpgp/_old 2015-11-24 22:33:55.000000000 +0100
+++ /var/tmp/diff_new_pack.ABHpgp/_new 2015-11-24 22:33:55.000000000 +0100
@@ -27,12 +27,14 @@
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 @@
%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}
++++++ fillets-ng-use-lua-5.1.pc.patch ++++++
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",
