[ed2k_hash] Rebuild for fltk-1.3.0. Rebase ed2k_hash-gcc43.patch (Caused FTBS).
corsepiu
corsepiu at fedoraproject.org
Mon Jun 13 09:23:55 UTC 2011
commit 0853b61357cbd1966c28d682efd9e1384859d72e
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Mon Jun 13 11:23:43 2011 +0200
Rebuild for fltk-1.3.0.
Rebase ed2k_hash-gcc43.patch (Caused FTBS).
ed2k_hash-gcc43.patch | 30 +++++++++++++++---------------
ed2k_hash.spec | 6 +++++-
2 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/ed2k_hash-gcc43.patch b/ed2k_hash-gcc43.patch
index a7eb667..7dfd1cb 100644
--- a/ed2k_hash-gcc43.patch
+++ b/ed2k_hash-gcc43.patch
@@ -1,18 +1,6 @@
-diff -up ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp.gcc43 ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp
---- ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp.gcc43 2003-05-25 13:55:33.000000000 +0200
-+++ ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp 2008-01-06 14:48:05.000000000 +0100
-@@ -28,6 +28,8 @@
- **********************************************************************/
- // $Id: ed2k_hash-gcc43.patch,v 1.1 2008/01/06 14:26:28 rathann Exp $
-
-+#include <cstdlib>
-+#include <cstring>
- #include "JobQueue.h"
- #include "MainWindow.h"
- #include "Event.h"
-diff -up ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp.gcc43 ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp
---- ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp.gcc43 2004-01-09 22:12:11.000000000 +0100
-+++ ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp 2008-01-06 15:17:14.000000000 +0100
+diff -Naur ed2k_hash-0.4.0.orig/ed2k_hash/GUI/Configuration.cpp ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp
+--- ed2k_hash-0.4.0.orig/ed2k_hash/GUI/Configuration.cpp 2004-01-09 22:12:11.000000000 +0100
++++ ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp 2011-06-13 11:16:40.554679474 +0200
@@ -42,7 +42,7 @@
#include <stdio.h>
@@ -22,3 +10,15 @@ diff -up ed2k_hash-0.4.0/ed2k_hash/GUI/Configuration.cpp.gcc43 ed2k_hash-0.4.0/e
#include <iostream>
using namespace std;
+diff -Naur ed2k_hash-0.4.0.orig/ed2k_hash/GUI/JobQueue.cpp ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp
+--- ed2k_hash-0.4.0.orig/ed2k_hash/GUI/JobQueue.cpp 2003-05-25 13:55:33.000000000 +0200
++++ ed2k_hash-0.4.0/ed2k_hash/GUI/JobQueue.cpp 2011-06-13 11:16:40.553679454 +0200
+@@ -28,6 +28,8 @@
+ **********************************************************************/
+ // $Id: JobQueue.cpp,v 1.1 2003/05/25 11:55:33 fraca7 Exp $
+
++#include <cstdlib>
++#include <cstring>
+ #include "JobQueue.h"
+ #include "MainWindow.h"
+ #include "Event.h"
diff --git a/ed2k_hash.spec b/ed2k_hash.spec
index bf0faae..c6d8e9d 100644
--- a/ed2k_hash.spec
+++ b/ed2k_hash.spec
@@ -3,7 +3,7 @@
Summary: Edonkey 2000 file hash calculator
Name: ed2k_hash
Version: 0.4.0
-Release: 11%{?dist}
+Release: 12%{?dist}
URL: http://ed2k-tools.sourceforge.net/index.shtml
Group: Applications/File
Source0: http://downloads.sourceforge.net/sourceforge/ed2k-tools/%{name}-%{version}.tar.gz
@@ -78,6 +78,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_iconsdir}/%{name}.png
%changelog
+* Mon Jun 13 2011 Ralf Corsépius <corsepiu at fedoaproject.org> - 0.4.0-12
+- Rebuild for fltk-1.3.0.
+- Rebase ed2k_hash-gcc43.patch (Caused FTBS).
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list