commit 48db44ba4c0a4103d8036fe72df2f6ddb4ea41f5
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 14 20:15:30 2015 +0200
- cleanup linking issues
- rel 2
guichan.spec | 11 ++++++++---
link.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/guichan.spec b/guichan.spec
index 63dec67..987f719 100644
--- a/guichan.spec
+++ b/guichan.spec
@@ -5,11 +5,12 @@ Summary: Guichan - small, efficient C++ GUI library
designed for games
Summary(pl.UTF-8): Guichan - mała, wydajna biblioteka GUI w C++
przeznaczona do gier
Name: guichan
Version: 0.8.2
-Release: 1
+Release: 2
License: BSD
Group: Libraries
Source0: http://guichan.googlecode.com/files/%{name}-%{version}.tar.gz
# Source0-md5: af535d7f387e774e3197cef8023ea105
+Patch0: link.patch
URL: http://guichan.sourceforge.net/
BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
@@ -22,6 +23,9 @@ BuildRequires: libtool
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
@@ -59,6 +63,7 @@ Statyczne wersje bibliotek Guichan.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -68,8 +73,8 @@ Statyczne wersje bibliotek Guichan.
%{__automake}
%configure \
%{!?with_allegro:--disable-allegro}
-%{__make} \
- CFLAGS="%{rpmcflags}"
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..13f5573
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,33 @@
+--- guichan-0.8.2/src/sdl/Makefile.am.orig 2009-09-03 22:35:02.000000000
+0200
++++ guichan-0.8.2/src/sdl/Makefile.am 2015-06-14 19:55:26.245067135 +0200
+@@ -6,6 +6,8 @@
+
+ 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_SOURCES = \
+ sdl.cpp \
+ sdlgraphics.cpp \
+--- guichan-0.8.2/src/opengl/Makefile.am.orig 2015-06-14 19:55:58.650327720
+0200
++++ guichan-0.8.2/src/opengl/Makefile.am 2015-06-14 19:57:17.981358433
+0200
+@@ -4,6 +4,8 @@
+
+ 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_SOURCES = \
+ opengl.cpp \
+ openglimage.cpp \
+--- guichan-0.8.2/src/allegro/Makefile.am~ 2009-09-03 22:35:02.000000000
+0200
++++ guichan-0.8.2/src/allegro/Makefile.am 2015-06-14 20:09:44.940816861
+0200
+@@ -4,6 +4,8 @@
+
+ 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_SOURCES = \
+ allegro.cpp \
+ allegrofont.cpp \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/guichan.git/commitdiff/48db44ba4c0a4103d8036fe72df2f6ddb4ea41f5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
