rpms/pokerth/F-13 pokerth-libs.patch,NONE,1.1 pokerth.spec,1.6,1.7

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/pokerth/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3497

Modified Files:
	pokerth.spec 
Added Files:
	pokerth-libs.patch 
Log Message:
Fix FTBFS.

pokerth-libs.patch:
 pokerth_game.pro   |   27 ++++++++++++++++++---------
 pokerth_server.pro |   11 +++++++++--
 2 files changed, 27 insertions(+), 11 deletions(-)

--- NEW FILE pokerth-libs.patch ---
diff -up PokerTH-0.7.1-src/pokerth_game.pro.orig PokerTH-0.7.1-src/pokerth_game.pro
--- PokerTH-0.7.1-src/pokerth_game.pro.orig	2009-06-26 02:29:19.000000000 +0300
+++ PokerTH-0.7.1-src/pokerth_game.pro	2010-06-03 00:08:23.095328246 +0300
@@ -360,6 +360,7 @@ unix:!mac { 
     LIBPATH += lib
     LIB_DIRS = $${PREFIX}/lib \
         $${PREFIX}/lib64
+
     BOOST_FS = boost_filesystem \
         boost_filesystem-mt
     BOOST_THREAD = boost_thread \
@@ -368,40 +369,48 @@ unix:!mac { 
         boost_iostreams-mt
     BOOST_REGEX = boost_regex \
         boost_regex-mt
-    
+    BOOST_SYS = boost_system \
+        boost_system-mt
+
     # searching in $PREFIX/lib and $PREFIX/lib64
     # to override the default '/usr' pass PREFIX
     # variable to qmake.
-    for(dir, LIB_DIRS):exists($$dir) { 
-        for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) { 
+    for(dir, LIB_DIRS):exists($$dir) {
+        for(lib, BOOST_THREAD):exists($${dir}/lib$${lib}.so*) {
             message("Found $$lib")
             BOOST_THREAD = -l$$lib
         }
-        for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) { 
+        for(lib, BOOST_FS):exists($${dir}/lib$${lib}.so*) {
             message("Found $$lib")
             BOOST_FS = -l$$lib
         }
-        for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) { 
+        for(lib, BOOST_IOSTREAMS):exists($${dir}/lib$${lib}.so*) {
             message("Found $$lib")
             BOOST_IOSTREAMS = -l$$lib
         }
-        for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) { 
+        for(lib, BOOST_REGEX):exists($${dir}/lib$${lib}.so*) {
             message("Found $$lib")
             BOOST_REGEX = -l$$lib
         }
+        for(lib, BOOST_SYS):exists($${dir}/lib$${lib}.so*) {
+            message("Found $$lib")
+            BOOST_SYS = -l$$lib
+        }
     }
     BOOST_LIBS = $$BOOST_THREAD \
         $$BOOST_FS \
         $$BOOST_IOSTREAMS \
-        $$BOOST_REGEX
-    !count(BOOST_LIBS, 4):error("Unable to find boost libraries in PREFIX=$${PREFIX}")
+        $$BOOST_REGEX \
+        $$BOOST_SYS
+    !count(BOOST_LIBS, 5):error("Unable to find boost libraries in PREFIX=$${PREFIX}")
+
     if($$system(sdl-config --version)):error("sdl-config not found in PATH - libSDL_mixer, libSDL are required!")
     UNAME = $$system(uname -s)
     BSD = $$find(UNAME, "BSD")
     kFreeBSD = $$find(UNAME, "kFreeBSD")
     LIBS += -lpokerth_lib
     LIBS += $$BOOST_LIBS
-    LIBS += -lSDL_mixer \
+    LIBS += -lSDL -lSDL_mixer \
         -lcurl
     !isEmpty( BSD ) && isEmpty( kFreeBSD ):LIBS += -lcrypto
     else:LIBS += -lgnutls-openssl \
diff -up PokerTH-0.7.1-src/pokerth_server.pro.orig PokerTH-0.7.1-src/pokerth_server.pro
--- PokerTH-0.7.1-src/pokerth_server.pro.orig	2009-06-26 02:29:46.000000000 +0300
+++ PokerTH-0.7.1-src/pokerth_server.pro	2010-06-03 00:45:56.656243385 +0300
@@ -191,6 +191,7 @@ unix : !mac {
         BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
         BOOST_IOSTREAMS = boost_iostreams boost_iostreams-mt
 	BOOST_REGEX = boost_regex boost_regex-mt
+	BOOST_SYS = boost_system boost_system-mt
 
         #
         # searching in $PREFIX/lib and $PREFIX/lib64
@@ -229,10 +230,16 @@ unix : !mac {
                         BOOST_REGEX = -l$$lib
                     }
                 }
+                for(lib, BOOST_SYS){
+                    exists($${dir}/lib$${lib}.so*){
+                        message("Found $$lib")
+                        BOOST_SYS = -l$$lib
+                    }
+                }
             }
         }
-        BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX
-        !count(BOOST_LIBS, 5){
+        BOOST_LIBS = $$BOOST_THREAD $$BOOST_FS $$BOOST_PROGRAM_OPTIONS $$BOOST_IOSTREAMS $$BOOST_REGEX $$BOOST_SYS
+        !count(BOOST_LIBS, 6){
             error("Unable to find boost libraries in PREFIX=$${PREFIX}")
         }
 


Index: pokerth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pokerth/F-13/pokerth.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pokerth.spec	21 Jan 2010 14:06:04 -0000	1.6
+++ pokerth.spec	20 Jun 2010 07:33:39 -0000	1.7
@@ -1,11 +1,13 @@
 Name:		pokerth
 Version:	0.7.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Texas-Holdem poker game
 Group:		Amusements/Games
 License:	GPLv2+
 URL:		http://www.pokerth.net
 Source0:	http://downloads.sourceforge.net/%{name}/PokerTH-%{version}-src.tar.bz2
+# Patch to include all necessary libraries in linking phase
+Patch0:		pokerth-libs.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	desktop-file-utils
@@ -28,6 +30,7 @@ is available for Linux, Windows, and Mac
 
 %prep
 %setup -q -n PokerTH-%{version}-src
+%patch0 -p1 -b .libs
 # Fix permissions
 chmod 644 ChangeLog
 find . -name *.h -exec chmod 644 {} \;
@@ -74,6 +77,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jun 03 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.1-4
+- Fix FTBFS caused by implicit DSO linking in rawhide.
+
 * Thu Jan 21 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.1-3
 - Bump spec due to change of boost soname.