rpms/amule/devel aMule-2.2.6-fix_FTBFS.patch, NONE, 1.1 amule.spec, 1.12, 1.13

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/amule/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32756

Modified Files:
	amule.spec 
Added Files:
	aMule-2.2.6-fix_FTBFS.patch 
Log Message:
- Fix FTBFS and gcc compiler bug
- Conditionalize noarch subpackage


aMule-2.2.6-fix_FTBFS.patch:
 amule.cpp                      |    2 +-
 utils/wxCas/src/wxcasframe.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE aMule-2.2.6-fix_FTBFS.patch ---
diff -up aMule-2.2.6/src/amule.cpp.new aMule-2.2.6/src/amule.cpp
--- aMule-2.2.6/src/amule.cpp.new	2009-08-18 18:24:58.000000000 +0200
+++ aMule-2.2.6/src/amule.cpp	2010-10-14 16:10:55.045018587 +0200
@@ -480,7 +481,7 @@ bool CamuleApp::OnInit()
 #endif
 
 	if ( !cmdline.Found(wxT("disable-fatal")) ) {
-#ifndef __WXMSW__
+#if wxUSE_ON_FATAL_EXCEPTION
 		// catch fatal exceptions
 		wxHandleFatalExceptions(true);
 #endif
diff -up aMule-2.2.6/src/utils/wxCas/src/wxcasframe.cpp.new aMule-2.2.6/src/utils/wxCas/src/wxcasframe.cpp
--- aMule-2.2.6/src/utils/wxCas/src/wxcasframe.cpp.new	2008-09-06 17:39:00.000000000 +0200
+++ aMule-2.2.6/src/utils/wxCas/src/wxcasframe.cpp	2010-10-14 15:22:20.874269526 +0200
@@ -289,7 +289,7 @@ WxCasFrame::GetStatImage () const
 #else
 
 	memdc.
-	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
 #endif
 
 	memdc.


Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/devel/amule.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- amule.spec	13 Oct 2010 15:19:06 -0000	1.12
+++ amule.spec	14 Oct 2010 14:34:51 -0000	1.13
@@ -7,6 +7,7 @@
 License:        GPLv2+
 Group:          Applications/Internet
 Source0:        http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
+Patch0:         aMule-2.2.6-fix_FTBFS.patch
 URL:            http://amule.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # See http://www.amule.org/wiki/index.php/Requirements
@@ -38,7 +39,9 @@
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
 Requires:       xchat
-BuildArch:      noarch
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5 
+BuildArch:      noarch 
+%endif 
 
 %description -n xchat-%{name}
 This plugins allows you to display aMule statistics in XChat
@@ -46,6 +49,7 @@
 
 %prep
 %setup -q -n aMule-%{version}
+%patch0 -p1 -b .new
 manfiles=`find . -name "*.1"`
 for manfile in $manfiles; do
     iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
@@ -165,8 +169,9 @@
 
 
 %changelog
-* Wed Oct 13 2010 Nicolas Chauvet <kwizart at gmail.com> - 2.2.6-3
-- rebuilt
+* Thu Oct 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 2.2.6-3
+- Fix FTBFS and gcc compiler bug
+- Conditionalize noarch subpackage
 
 * Fri Sep 24 2010 Felix Kaechele <heffer at fedoraproject.org> - 2.2.6-2
 - rebuild for new wx