[qbittorrent] * Fri Aug 13 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-3 - remove temporary gcc45 patc

[Leigh Scott]

commit 1da19616991b99551b75de56c81fc2d00eca25c9
Author: Leigh Scott <leigh123linux at googlemail.com>
Date:   Fri Aug 13 14:57:26 2010 +0100

    * Fri Aug 13 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-3
    - remove temporary gcc45 patch and replace with upstream fix

 gcc-4.5-fix.patch    |   22 ++++++++++++++++++++++
 gcc45_temp_fix.patch |   36 ------------------------------------
 qbittorrent.spec     |    9 ++++++---
 3 files changed, 28 insertions(+), 39 deletions(-)
---
diff --git a/gcc-4.5-fix.patch b/gcc-4.5-fix.patch
new file mode 100644
index 0000000..c7ad900
--- /dev/null
+++ b/gcc-4.5-fix.patch
@@ -0,0 +1,22 @@
+Index: src/main.cpp
+===================================================================
+--- src/main.cpp	(revision 4323)
++++ src/main.cpp	(working copy)
+@@ -135,7 +135,7 @@
+   std::cerr << "\n\n*************************************************************\n";
+   std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
+   print_stacktrace();
+-  std::raise(SIGSEGV);
++  raise(SIGSEGV);
+ }
+ void sigabrtHandler(int) {
+   signal(SIGABRT, 0);
+@@ -143,7 +143,7 @@
+   std::cerr << "\n\n*************************************************************\n";
+   std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
+   print_stacktrace();
+-  std::raise(SIGABRT);
++  raise(SIGABRT);
+ }
+ #endif
+ 
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 583e7f2..2d78886 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -3,7 +3,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client 
 Version: 2.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:   1
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -16,9 +16,9 @@ Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.gz
 Source1: qbittorrent-nox.README
 Patch0:  disable_extra_debug.patch
 Patch1:  qt_deprecated.patch
-Patch2:  gcc45_temp_fix.patch
 
 # Upstream patches
+Patch2:  gcc-4.5-fix.patch
 
 URL: http://sourceforge.net/projects/qbittorrent
 Group: Applications/Internet
@@ -54,7 +54,7 @@ It aims to be as fast as possible and to provide multi-OS, unicode support.
 %setup -q -n %{name}-%{version}
 #%patch0 -p1 -b .disable_extra_debug
 %patch1 -p1 -b .qt_deprecated
-%patch2 -p1 -b .gcc45_temp_fix
+%patch2 -p0 -b .gcc-4.5-fix
 # Upstream patches
 
 cp -p %{SOURCE1} .
@@ -129,6 +129,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Aug 13 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-3
+- remove temporary gcc45 patch and replace with upstream fix
+
 * Fri Jul 30 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-2
 - rebuild for new boost version
 - add gcc45 patch (temporary patch till it's fixed properly)