c++ build error fixed, release 6 for rebuild with new cryptopp, TODO added.

diff --git a/aMule-cxx.patch b/aMule-cxx.patch
new file mode 100644 (file)
index 0000000..20f734e
--- /dev/null
+++ b/aMule-cxx.patch
@@ -0,0 +1,19 @@
+--- aMule-2.3.1/src/ObservableQueue.h.orig     2011-06-13 10:50:25.000000000 +0200
++++ aMule-2.3.1/src/ObservableQueue.h  2012-09-11 20:32:12.755720386 +0200
+@@ -331,14 +331,14 @@
+ 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 );
+ }
+ 
+ 

diff --git a/aMule.spec b/aMule.spec
index 7cc9e3f41f97e5291effcc4375d8336f9c8e3058..9b10740ef262f0947279a726952ee47478673618 100644 (file)
--- a/aMule.spec
+++ b/aMule.spec
@@ -1,8 +1,11 @@
+#
+# TODO: ./configure --enable-plasmamule
+#
 Summary:       Unix port of eMule client
 Summary(pl.UTF-8):     Uniksowy port klienta eMule
 Name:          aMule
 Version:       2.3.1
-Release:       5
+Release:       6
 License:       GPL
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
@@ -10,6 +13,7 @@ Source0:      http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-cas-datadir.patch
 Patch2:                %{name}-ac.patch
+Patch3:                %{name}-cxx.patch
 URL:           http://www.amule.org/
 BuildRequires: GeoIP-devel
 BuildRequires: autoconf
@@ -83,6 +87,7 @@ Narzędzie do generownia statystyk aMule.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal} -I m4