[pokerth/f20] Re-generate Ville's patch to work with PokerTH 1.1.1

Ryan Rix rrix at fedoraproject.org
Sat Jun 14 05:21:39 UTC 2014


commit c92f2019bdf48fd3958e65d121ca660556d5275f
Author: Ryan Rix <ry at n.rix.si>
Date:   Sat Jun 14 05:20:23 2014 +0000

    Re-generate Ville's patch to work with PokerTH 1.1.1

 pokerth-1.0.1-system-qtsingleapp.patch |   30 ------------------------------
 pokerth-1.1.1-system-qtsingleapp.patch |   30 ++++++++++++++++++++++++++++++
 pokerth.spec                           |    7 +++++--
 3 files changed, 35 insertions(+), 32 deletions(-)
---
diff --git a/pokerth-1.1.1-system-qtsingleapp.patch b/pokerth-1.1.1-system-qtsingleapp.patch
new file mode 100644
index 0000000..243a92c
--- /dev/null
+++ b/pokerth-1.1.1-system-qtsingleapp.patch
@@ -0,0 +1,30 @@
+diff -Nur PokerTH-1.1.1-src/pokerth_game.pro PokerTH-1.1.1-src-fedora/pokerth_game.pro
+--- PokerTH-1.1.1-src/pokerth_game.pro	2014-01-10 21:18:20.743643000 +0000
++++ PokerTH-1.1.1-src-fedora/pokerth_game.pro	2014-06-14 05:15:10.996114724 +0000
+@@ -10,13 +10,13 @@
+ TEMPLATE = app
+ CODECFORSRC = UTF-8
+ CONFIG += qt \
++	qtsingleapplication \
+ 	thread \
+ 	embed_manifest_exe \
+ 	exceptions \
+ 	rtti \
+ 	stl \
+ 	warn_on
+-include(src/third_party/qtsingleapplication/qtsingleapplication.pri)
+ QT += sql
+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+ UI_DIR = uics
+diff -Nur PokerTH-1.1.1-src/src/pokerth.cpp PokerTH-1.1.1-src-fedora/src/pokerth.cpp
+--- PokerTH-1.1.1-src/src/pokerth.cpp	2014-01-10 21:18:20.926643000 +0000
++++ PokerTH-1.1.1-src-fedora/src/pokerth.cpp	2014-06-14 05:13:35.369215381 +0000
+@@ -55,7 +55,7 @@
+ #include "startsplash.h"
+ #include "game_defs.h"
+ #include <net/socket_startup.h>
+-#include <third_party/qtsingleapplication/qtsingleapplication.h>
++#include <QtSingleApplication>
+ 
+ #ifdef _MSC_VER
+ #ifdef _DEBUG
diff --git a/pokerth.spec b/pokerth.spec
index 91fc101..73fb6fe 100644
--- a/pokerth.spec
+++ b/pokerth.spec
@@ -1,6 +1,6 @@
 Name:           pokerth
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Texas-Holdem poker game
 Group:          Amusements/Games
 # Has a typical OpenSSL linking exception
@@ -10,7 +10,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/PokerTH-%{version}-src.
 
 Patch0:         fix-libircclient-include.patch
 Patch1:         pokerth-0.8.3-gnutls-only.patch
-Patch2:         pokerth-1.0.1-system-qtsingleapp.patch
+Patch2:         pokerth-1.1.1-system-qtsingleapp.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  qt4-devel
@@ -89,6 +89,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Fri Jun 13 2014 Ryan Rix <ry at n.rix.si> - 1.1.1-3
+- Re-generate Ville's patch to work with PokerTH 1.1.1
+
 * Fri Jun 13 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-2
 - Use system qtsingleappliaction instead of bundled one
 


More information about the scm-commits mailing list