[pokerth/f14/master] Update to 0.8 branch, fixing FTBFS.
Jussi Lehtola
jussilehtola at fedoraproject.org
Tue Sep 7 15:01:31 UTC 2010
commit 9b74f562fb13449ec4ee5516eea711de9618c0cf
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Tue Sep 7 18:01:34 2010 +0300
Update to 0.8 branch, fixing FTBFS.
pokerth-libs.patch | 105 ++++-----------------------------------------------
pokerth.spec | 21 ++++++++--
sources | 2 +-
3 files changed, 26 insertions(+), 102 deletions(-)
---
diff --git a/pokerth-libs.patch b/pokerth-libs.patch
index 2e30be3..25c6fff 100644
--- a/pokerth-libs.patch
+++ b/pokerth-libs.patch
@@ -1,99 +1,12 @@
-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
+diff -up PokerTH-0.8-2490svn/pokerth_game.pro.orig PokerTH-0.8-2490svn/pokerth_game.pro
+--- PokerTH-0.8-2490svn/pokerth_game.pro.orig 2010-08-23 00:42:55.740949492 +0300
++++ PokerTH-0.8-2490svn/pokerth_game.pro 2010-08-23 01:02:02.790949570 +0300
+@@ -416,7 +416,7 @@ unix:!mac {
+ -lpokerth_db \
+ -lpokerth_protocol
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}")
- }
-
+ -lcurl \
+ -lgsasl
+ !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto
diff --git a/pokerth.spec b/pokerth.spec
index fa4e17b..d4abacd 100644
--- a/pokerth.spec
+++ b/pokerth.spec
@@ -1,11 +1,14 @@
+%global betarel beta3
+
Name: pokerth
-Version: 0.7.1
-Release: 4%{?dist}
+Version: 0.8
+Release: 0.1.%{betarel}%{?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
+Source0: http://downloads.sourceforge.net/%{name}/PokerTH-%{version}-%{betarel}-src.tar.bz2
+#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)
@@ -17,6 +20,7 @@ BuildRequires: libcurl-devel
BuildRequires: gnutls-devel
BuildRequires: boost-devel >= 1.37
BuildRequires: SDL_mixer-devel
+BuildRequires: libgsasl-devel
# Removed bundled fonts
Requires: dejavu-sans-fonts
@@ -29,8 +33,10 @@ play network games with people all over the world. This poker engine
is available for Linux, Windows, and MacOSX.
%prep
-%setup -q -n PokerTH-%{version}-src
+#%setup -q -n PokerTH-%{version}-src
+%setup -q -n PokerTH-%{version}-%{betarel}-src
%patch0 -p1 -b .libs
+
# Fix permissions
chmod 644 ChangeLog
find . -name *.h -exec chmod 644 {} \;
@@ -75,8 +81,13 @@ rm -rf %{buildroot}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
-
%changelog
+* Tue Sep 07 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8-0.1.beta3
+- Upgrade to 0.8 series due to boost incompatibility.
+
+* Mon Aug 02 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.1-5
+- Bump spec due to boost upgrade.
+
* Thu Jun 03 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.7.1-4
- Fix FTBFS caused by implicit DSO linking in rawhide.
diff --git a/sources b/sources
index 49b7e6d..c1f72a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a26a369bf3aa4b6ed92d0cadacb626e5 PokerTH-0.7.1-src.tar.bz2
+c42854fc860bd721a538b638c1920f0d PokerTH-0.8-beta3-src.tar.bz2
More information about the scm-commits
mailing list