rpms/amule/F-16 aMule-2.3.1-gcc47.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 amule.spec, 1.14, 1.15 sources, 1.7, 1.8 aMule-2.1.3-gcc43.patch, 1.1, NONE aMule-2.1.3-multiple.patch, 1.1, NONE aMule-2.1.3-ocreate.patch, 1.1, NONE aMule-2.2.3-gcc44.patch, 1.1, NONE aMule-2.2.6-fix_FTBFS.patch, 1.1, NONE aMule-wx-1.2.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/amule/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19850/F-16

Modified Files:
	.cvsignore amule.spec sources 
Added Files:
	aMule-2.3.1-gcc47.patch 
Removed Files:
	aMule-2.1.3-gcc43.patch aMule-2.1.3-multiple.patch 
	aMule-2.1.3-ocreate.patch aMule-2.2.3-gcc44.patch 
	aMule-2.2.6-fix_FTBFS.patch aMule-wx-1.2.patch 
Log Message:
Fix build with gcc47


aMule-2.3.1-gcc47.patch:
 ObservableQueue.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE aMule-2.3.1-gcc47.patch ---
diff -up aMule-2.3.1/src/ObservableQueue.h.gcc47 aMule-2.3.1/src/ObservableQueue.h
--- aMule-2.3.1/src/ObservableQueue.h.gcc47	2011-06-13 10:50:25.000000000 +0200
+++ aMule-2.3.1/src/ObservableQueue.h	2012-05-13 19:20:12.019301155 +0200
@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
 template <typename ValueType>
 void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
 {
-	NotifyObservers( EventType( EventType::STARTING ), o );
+	this->NotifyObservers( EventType( EventType::STARTING ), o );
 }
 
 
 template <typename ValueType>
 void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
 {
-	NotifyObservers( EventType( EventType::STOPPING ), o );
+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Sep 2009 15:30:58 -0000	1.7
+++ .cvsignore	13 May 2012 17:26:59 -0000	1.8
@@ -1 +1 @@
-aMule-2.2.6.tar.bz2
+aMule-2.3.1.tar.xz


Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/amule.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amule.spec	26 Sep 2011 22:13:21 -0000	1.14
+++ amule.spec	13 May 2012 17:27:00 -0000	1.15
@@ -1,13 +1,13 @@
 # TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
 
 Name:           amule
-Version:        2.2.6
-Release:        4%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        File sharing client compatible with eDonkey
 License:        GPLv2+
 Group:          Applications/Internet
-Source0:        http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
-Patch0:         aMule-2.2.6-fix_FTBFS.patch
+Source0:        http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.xz
+Patch0:         aMule-2.3.1-gcc47.patch
 URL:            http://amule.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # See http://www.amule.org/wiki/index.php/Requirements
@@ -49,7 +49,7 @@
 
 %prep
 %setup -q -n aMule-%{version}
-%patch0 -p1 -b .new
+%patch0 -p1 -b .gcc47
 manfiles=`find . -name "*.1"`
 for manfile in $manfiles; do
     iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
@@ -61,15 +61,16 @@
 %configure \
     --disable-rpath \
     --disable-debug \
+    --docdir=%{_datadir}/doc/%{name}-%{version} \
     --enable-wxcas \
     --enable-cas \
     --enable-alc \
     --enable-alcc \
+    --enable-xas \
     --enable-amule-daemon \
     --enable-amulecmd \
     --enable-webserver \
     --enable-amule-daemon \
-    --enable-utf8-systray \
     --enable-geoip \
     --enable-ccache \
     --enable-amule-gui \
@@ -118,7 +119,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/aMule-%{version}
+%doc ABOUT-NLS
 %{_bindir}/alc
 %{_bindir}/amule
 %{_bindir}/cas
@@ -169,8 +170,11 @@
 
 
 %changelog
-* Tue Sep 27 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.6-4
-- Rebuilt for libupnp
+* Sun May 13 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3.1-1
+- Fix build with gcc47
+
+* Mon Jan 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3.1-0
+- Update to 2.3.1
 
 * Thu Oct 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 2.2.6-3
 - Fix FTBFS and gcc compiler bug


Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	20 Sep 2009 15:30:58 -0000	1.7
+++ sources	13 May 2012 17:27:00 -0000	1.8
@@ -1 +1 @@
-530d9b48187e36f78fc21bb19e94326d  aMule-2.2.6.tar.bz2
+5f5707ad2073d37100409870aa5d3f93  aMule-2.3.1.tar.xz


--- aMule-2.1.3-gcc43.patch DELETED ---


--- aMule-2.1.3-multiple.patch DELETED ---


--- aMule-2.1.3-ocreate.patch DELETED ---


--- aMule-2.2.3-gcc44.patch DELETED ---


--- aMule-2.2.6-fix_FTBFS.patch DELETED ---


--- aMule-wx-1.2.patch DELETED ---