[packages/guichan] - enhanced link patch, now skip_post_check_so can be dropped

[qboosh]

commit 6d11d2cdbbc0aecbc93f14d4506eaf833a7ab5b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 14 16:07:58 2017 +0200

    - enhanced link patch, now skip_post_check_so can be dropped

 guichan.spec | 11 +++++------
 link.patch   | 14 +++++++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/guichan.spec b/guichan.spec
index 4499eee..e1600d3 100644
--- a/guichan.spec
+++ b/guichan.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without	allegro     # without allegro support
 #
@@ -8,6 +9,7 @@ Version:	0.8.2
 Release:	3
 License:	BSD
 Group:		Libraries
+# NOTE: now sources available at https://gitorious.org/guichan/mainline
 Source0:	http://guichan.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5:	af535d7f387e774e3197cef8023ea105
 Patch0:		link.patch
@@ -16,16 +18,13 @@ BuildRequires:	OpenGL-devel
 BuildRequires:	SDL-devel
 BuildRequires:	SDL_image-devel
 %{?with_allegro:BuildRequires:      allegro-devel}
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.57
+BuildRequires:	automake >= 1.4
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# use symbold from libguichan.so (fixing would cause link loop)
-%define		skip_post_check_so	libguichan_.*.so.*
-
 %description
 Guichan is a small, efficient C++ GUI library designed for games. It
 comes with a standard set of widgets and can use several different
diff --git a/link.patch b/link.patch
index 13f5573..27eff87 100644
--- a/link.patch
+++ b/link.patch
@@ -4,7 +4,7 @@
  
  libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
-+libguichan_sdl_la_LIBADD = -lSDL -lSDL_image
++libguichan_sdl_la_LIBADD = $(top_builddir)/src/libguichan.la -lSDL -lSDL_image
 +
  libguichan_sdl_la_SOURCES =	\
  	sdl.cpp			\
@@ -15,7 +15,7 @@
  
  libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 
  
-+libguichan_opengl_la_LIBADD = -lGL
++libguichan_opengl_la_LIBADD = $(top_builddir)/src/libguichan.la -lGL
 +
  libguichan_opengl_la_SOURCES =	\
  	opengl.cpp		\
@@ -26,8 +26,16 @@
  
  libguichan_allegro_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
-+libguichan_allegro_la_LIBADD = -lalleg
++libguichan_allegro_la_LIBADD = $(top_builddir)/src/libguichan.la -lalleg
 +
  libguichan_allegro_la_SOURCES =		\
  		allegro.cpp		\
  		allegrofont.cpp		\
+--- guichan-0.8.2/src/Makefile.am.orig	2009-09-03 22:35:02.000000000 +0200
++++ guichan-0.8.2/src/Makefile.am	2017-07-14 16:06:00.672219356 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
++SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guichan.git/commitdiff/6d11d2cdbbc0aecbc93f14d4506eaf833a7ab5b2