rpms/amule/devel aMule-2.1.3-gcc43.patch, NONE, 1.1 aMule-2.1.3-multiple.patch, NONE, 1.1 aMule-2.1.3-ocreate.patch, NONE, 1.1 aMule-wx-1.2.patch, NONE, 1.1 amule.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thorsten Leemhuis thl at rpmfusion.org
Sun Aug 3 16:00:51 CEST 2008 

Author: thl

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

Modified Files:
	.cvsignore sources 
Added Files:
	aMule-2.1.3-gcc43.patch aMule-2.1.3-multiple.patch 
	aMule-2.1.3-ocreate.patch aMule-wx-1.2.patch amule.spec 
Log Message:
initial import

aMule-2.1.3-gcc43.patch:

--- NEW FILE aMule-2.1.3-gcc43.patch ---
diff -up aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43 aMule-2.1.3/src/ED2KLinkParser.cpp
--- aMule-2.1.3/src/ED2KLinkParser.cpp.gcc43	2008-04-08 15:46:36.000000000 +0200
+++ aMule-2.1.3/src/ED2KLinkParser.cpp	2008-04-08 15:47:16.000000000 +0200
@@ -32,6 +32,7 @@ const int versionRevision	= 1;
 #include <sstream>
 #include <iostream>
 #include <fstream>
+#include <cstdlib>
 
 #ifdef __APPLE__
 	#include <CoreServices/CoreServices.h>

aMule-2.1.3-multiple.patch:

--- NEW FILE aMule-2.1.3-multiple.patch ---
diff -up aMule-2.1.3/src/ExternalConnector.h.multiple aMule-2.1.3/src/ExternalConnector.h
--- aMule-2.1.3/src/ExternalConnector.h.multiple	2008-04-08 15:33:04.000000000 +0200
+++ aMule-2.1.3/src/ExternalConnector.h	2008-04-08 15:38:22.000000000 +0200
@@ -143,7 +143,7 @@ public:
 	bool Parse_Command(const wxString& buffer);
 	void GetCommand(const wxString &prompt, char* buffer, size_t buffer_size);
 	const CECPacket *SendRecvMsg_v2(const CECPacket *request) { return m_ECClient->SendRecvPacket(request); }
-	void ConnectAndRun(const wxString &ProgName, const wxString& ProgName);
+	void ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion);
 	void ShowGreet();
 
 	//

aMule-2.1.3-ocreate.patch:

--- NEW FILE aMule-2.1.3-ocreate.patch ---
diff -up aMule-2.1.3/src/FileFunctions.cpp.ocreate aMule-2.1.3/src/FileFunctions.cpp
--- aMule-2.1.3/src/FileFunctions.cpp.ocreate	2008-04-08 03:27:56.000000000 +0200
+++ aMule-2.1.3/src/FileFunctions.cpp	2008-04-08 03:32:13.000000000 +0200
@@ -599,7 +599,7 @@ FSCheckResult DoCheckFileSystem(const wx
 	wxString fullName = JoinPaths(path, wxT(":"));
 
 	// Try to open the file, without overwriting existing files.
-	int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL);
+	int fd = open(fullName.fn_str(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 	if (fd != -1) {
 		// Success, the file-system cant be FAT32
 		close(fd);

aMule-wx-1.2.patch:

--- NEW FILE aMule-wx-1.2.patch ---
diff -urN aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp
--- aMule-2.1.3.org/src/utils/wxCas/src/wxcasprefs.cpp	2005-12-16 13:09:29.000000000 +0100
+++ aMule-2.1.3/src/utils/wxCas/src/wxcasprefs.cpp	2006-12-17 20:20:47.151203000 +0100
@@ -297,7 +297,7 @@
 	m_validateButton =
 	    new wxButton ( this, ID_VALIDATE_BUTTON, wxString ( _( "Validate" ) ) );
 	m_cancelButton =
-	    new wxButton ( this, ID_CANCEL_BUTTON, wxString ( _( "Cancel" ) ) );
+	    new wxButton ( this, wxID_CANCEL, wxString ( _( "Cancel" ) ) );
 
 	m_buttonHBox->Add ( m_validateButton, 0, wxALIGN_CENTER | wxALL, 5 );
 	m_buttonHBox->Add ( m_cancelButton, 0, wxALIGN_CENTER | wxALL, 5 );
@@ -321,7 +321,6 @@
 EVT_BUTTON ( ID_OSPATH_BROWSE_BUTTON, WxCasPrefs::OnOSPathBrowseButton )
 EVT_BUTTON ( ID_AUTOSTATIMG_BROWSE_BUTTON, WxCasPrefs::OnAutoStatImgBrowseButton )
 EVT_BUTTON ( ID_VALIDATE_BUTTON, WxCasPrefs::OnValidateButton )
-EVT_BUTTON ( ID_CANCEL_BUTTON, WxCasPrefs::OnCancel )       	// Defined in wxDialog
 EVT_CHECKBOX ( ID_AUTOSTATIMG_CHECK, WxCasPrefs::OnAutoStatImgCheck )
 EVT_CHECKBOX ( ID_FTP_UPDATE_CHECK, WxCasPrefs::OnFtpUpdateCheck )
 END_EVENT_TABLE ()
--- aMule/src/utils/wxCas/src/wxcasprefs.h.org	2006-12-17 22:17:39.017417250 +0100
+++ aMule/src/utils/wxCas/src/wxcasprefs.h	2006-12-17 22:18:17.611829250 +0100
@@ -101,8 +101,7 @@
 	    ID_AUTOSTATIMG_COMBO,
 	    ID_AUTOSTATIMG_BROWSE_BUTTON,
 	    ID_FTP_UPDATE_CHECK,
-	    ID_VALIDATE_BUTTON,
-	    ID_CANCEL_BUTTON
+	    ID_VALIDATE_BUTTON
 	};
 
 protected:
--- aMule/src/MuleGifCtrl.cpp	2006-02-03 20:14:05.000000000 +0100
+++ aMule/src/MuleGifCtrl.cpp	2006-11-19 19:35:33.000000000 +0100
@@ -24,7 +24,6 @@
 
 #include <wx/mstream.h>
 #include <wx/gifdecod.h>
-#include <wx/window.h>
 #include <wx/dcbuffer.h>
 
 #include "MuleGifCtrl.h"
@@ -35,6 +34,50 @@
 	EVT_ERASE_BACKGROUND(MuleGifCtrl::OnErase)
 END_EVENT_TABLE()
 
+#if wxCHECK_VERSION(2, 7, 1)
+// Wrapper that emulates old wxGIFDecoder API
+
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+	MuleGIFDecoder(wxInputStream* stream, bool dummy) {
+		m_stream = stream;
+		dummy = dummy; // Unused.
+		m_nframe = 0;
+	}
+	
+	~MuleGIFDecoder() { /* don't delete the stream! */ }
+	
+	wxGIFErrorCode ReadGIF() {
+		return LoadGIF(*m_stream);
+	}
+	
+	void GoFirstFrame() { m_nframe = 0; }
+	void GoNextFrame(bool dummy) { m_nframe < GetFrameCount() ? m_nframe++ : m_nframe = 0; }
+	void GoLastFrame() { m_nframe = GetFrameCount(); }
+	
+	void ConvertToImage(wxImage* image) { wxGIFDecoder::ConvertToImage(m_nframe, image); }
+	
+	size_t GetLogicalScreenWidth() { return GetAnimationSize().GetWidth(); }
+	size_t GetLogicalScreenHeight() { return GetAnimationSize().GetHeight(); }
+	
+	size_t	GetLeft() { return 0; }
+	size_t	GetTop() { return 0; }
+	
+	long GetDelay() { return wxGIFDecoder::GetDelay(m_nframe); }
+	
+private:
+	uint32_t m_nframe;
+	wxInputStream* m_stream;
+};
+
+#else
+class MuleGIFDecoder : public wxGIFDecoder {
+public:
+	MuleGIFDecoder(wxInputStream* stream, bool flag) : wxGIFDecoder(stream,flag) {};
+};
+#endif
+
+
 
 MuleGifCtrl::MuleGifCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos,
                           const wxSize& size, long style, const wxValidator& validator,
@@ -66,7 +109,7 @@
 	}
 
   	wxMemoryInputStream stream(data, size);
-  	m_decoder = new wxGIFDecoder(&stream, TRUE);
+  	m_decoder = new MuleGIFDecoder(&stream, TRUE);
   	if ( m_decoder->ReadGIF() != wxGIF_OK ) {
    		delete m_decoder;
    		m_decoder = NULL;
@@ -137,3 +180,4 @@
 	dc.DrawBitmap( m_frame, x + m_decoder->GetLeft(), y + m_decoder->GetTop(), true);
 }
 
+// File_checked_for_headers
--- aMule/src/MuleGifCtrl.h	2006-01-01 06:17:25.000000000 +0100
+++ aMule/src/MuleGifCtrl.h	2006-11-18 05:01:22.000000000 +0100
@@ -27,11 +27,10 @@
 
 #include <wx/control.h>
 #include <wx/timer.h>
-#include <wx/bitmap.h>
 
 const int GIFTIMERID = 271283;
 
-class wxGIFDecoder;
+class MuleGIFDecoder;
 class wxBitmap;
 
 /**
@@ -121,7 +120,7 @@
 	void OnErase( wxEraseEvent& WXUNUSED(event) ) {}
 
 	//! A pointer to the current gif-animation.
-	wxGIFDecoder*	m_decoder;
+	MuleGIFDecoder*	m_decoder;
 	//! Timer used for the delay between each frame.
 	wxTimer			m_timer;
 	//! Current frame.
@@ -133,3 +132,4 @@
 
 #endif
 
+// File_checked_for_headers
--- aMule-2.1.3/src/MuleTextCtrl.cpp~	2006-12-17 20:55:37.157820250 +0100
+++ aMule-2.1.3/src/MuleTextCtrl.cpp	2006-12-17 20:56:21.328580750 +0100
@@ -26,6 +26,7 @@
 #include <wx/menu.h>
 #include <wx/intl.h>
 #include <wx/clipbrd.h>
+#include <wx/dataobj.h>
 
 /**
  * These are the IDs used to identify the different menu-items.
--- amule/src/amule.cpp~	2006-12-17 21:53:26.474639000 +0100
+++ amule/src/amule.cpp	2006-12-17 21:55:40.307003000 +0100
@@ -96,6 +96,7 @@
 		#include <CoreFoundation/CFBundle.h>
 		#include <wx/mac/corefoundation/cfstring.h>
 	#endif
+	#include <wx/msgdlg.h>
 #endif
 
 



--- NEW FILE amule.spec ---
Name:           amule
Version:        2.1.3
Release:        3%{?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-wx-1.2.patch
Patch1:         aMule-2.1.3-ocreate.patch
Patch2:         aMule-2.1.3-multiple.patch
Patch3:         aMule-2.1.3-gcc43.patch
URL:            http://amule.org
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
BuildRequires:  wxGTK-devel >= 0:2.6.2, desktop-file-utils, expat-devel
BuildRequires:  gd-devel >= 2.0.0, libpng-devel
BuildRequires:  gettext-devel, flex, bison
BuildRequires:  readline-devel
Requires(pre):  chkconfig

%description
aMule is an easy to use multi-platform client for ED2K Peer-to-Peer
Network. It is a fork of xMule, whis was based on eMule for
Windows. aMule currently supports (but is not limited to) the
following platforms: Linux, *BSD and MacOS X.

%package -n xchat-%{name}
Summary:        Plugin to display aMule's statistics in XChat
Group:          Applications/Internet
Requires:       %{name} = %{version}-%{release}
Requires:       xchat

%description -n xchat-%{name}
This plugins allows you to display aMule statistics in XChat


%prep
%setup -q -n aMule-%{version}
%patch0 -p1 -b .wx28
%patch1 -p1 -b .ocreate
%patch2 -p1 -b .multiple
%patch3 -p1 -b .gcc43


%build
%configure \
    --disable-rpath \
    --disable-debug \
    --enable-wxcas \
    --enable-cas \
    --enable-alc \
    --enable-alcc \
    --enable-amule-daemon \
    --enable-amulecmd \
    --enable-webserver \
    --enable-amule-daemon \
    --enable-utf8-systray

#    --enable-amule-gui        compile aMule remote GUI (EXPERIMENTAL)


make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT _docs

make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

%find_lang %{name}

# desktop files
desktop-file-install --vendor livna \
                     --delete-original\
                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
                     --add-category Application\
                     --add-category Network\
                     --add-category X-Livna\
                     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

iconv -f ISO-8859-1 -t UTF-8 < src/utils/aLinkCreator/alc.desktop \
      > $RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
desktop-file-install --vendor livna \
                     --delete-original\
                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
                     --add-category X-Livna\
                     $RPM_BUILD_ROOT%{_datadir}/applications/alc.desktop
install -m 644 src/utils/aLinkCreator/alc.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/alc.xpm

desktop-file-install --vendor livna \
                     --delete-original\
                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
                     --add-category X-Livna\
                     $RPM_BUILD_ROOT%{_datadir}/applications/wxcas.desktop
install -m 644 src/utils/wxCas/wxcas.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root)
%doc %{_datadir}/doc/aMule-%{version}
%{_bindir}/*
%{_datadir}/%{name}/
%{_datadir}/cas
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
%{_mandir}/man1/*.gz
%{_mandir}/*/man1/*.gz

%files -n xchat-%{name}
%defattr(-,root,root)
%{_libdir}/xchat/plugins/xas.pl


%changelog
* Tue Mar 04 2007 kwizart <kwizart at gmail.com > - 2.1.3-3
- Fix wxGTK 2.8.x
- Fix open with O_CREATE
- Prevent timestramps on install
- Add missing BR
- Fix gcc43
- Fix multiple parameter named ProgName

* Sat Oct 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.1.3-2
- rebuild

* Mon Jun 12 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.3-1
- version 2.1.3

* Tue May 30 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
- version 2.1.2

* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
- version 2.1.1

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Thu Jun 16 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.3-0.lvn.1
- version 2.0.3

* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.2-0.lvn.1
- version 2.0.2

* Sat Jun 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> 2.0.1-0.lvn.2
- BR /usr/bin/autopoint instead of gettext; This gives us gettext on pre
  FC4 and gettext-devel on FC4

* Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 2.0.1-0.lvn.1
- version 2.0.1

* Wed May 04 2005 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.1
- version 2.0 final(ly)
- drop epoch

* Fri Dec 24 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.7.rc8
- update to rc8

* Wed Oct 20 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.6.rc7
- update to rc7: no need for cryptopp anymore

* Mon Jul 19 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.5.rc5
- update to rc5

* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.4.rc4a
- update to rc4a (hotfix)

* Wed Jul 14 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.3.rc4
- fix desktop files for alc and wxcas
- convert tabs into spaces (use diff -b)

* Tue Jul 13 2004 Dams <anvil[AT]livna.org> 0:2.0.0-0.lvn.0.2.rc4
- Removing temporary _docs directory before attempting to create it

* Mon Jul 12 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc4
- Version 2.0.0rc4
- new xchat-amule subpackage

* Sun Jun 13 2004 Aurelien Bompard <gauret[AT]free.fr> 0:2.0.0-0.lvn.0.1.rc3
- Version 2.0.0rc3

* Tue Feb 17 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.6-0.lvn.1
- Version 1.2.6

* Tue Feb 10 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.5-0.lvn.1
- Version 1.2.5
- Dropped alternatives support (we conflict and obsolete xmule)

* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.4
- Added explicit BuildReq:openssl-devel (else it wont build on rh9/rh8
  because of curl-devel packaging bug)

* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.2.4-0.lvn.3
- Re-add explicit conflits:xmule

* Tue Jan 13 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.2
- Obsoletes xmule (the project seems to have stopped)

* Mon Jan 12 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-0.lvn.1
- version 1.2.4 (small bugfix release)

* Sat Jan 03 2004 Aurelien Bompard <gauret[AT]free.fr> 1.2.3-0.lvn.1
- new version: 1.2.3
- added webserver support (still a little buggy according to aMule's website)

* Thu Dec 18 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.2
- remove enable-optimize
- update Conflicts
- add Epoch: 0

* Mon Dec 15 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.1-0.lvn.1
- version 1.2.1
- doesn't require wget anymore : libcurl is used instead
- add BuildRequires: curl-devel
- Move Prereq to Requires(pre)
- add enable-optimise to configure

* Thu Nov 27 2003 Aurelien Bompard <gauret[AT]free.fr> 1.2.0-0.lvn.1
- version 1.2.0

* Fri Nov 14 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.3
- Change conflicts
- s/Fedora/Livna/

* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.2
- fix preun

* Wed Nov 12 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-0.lvn.1
- lots of fixes, thanks to Dams (anvil[AT]livna.org)

* Wed Nov 05 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.2-1
- new version

* Sat Nov 01 2003 Aurelien Bompard <gauret[AT]free.fr> 1.1.1-1
- RedHatification (from PLF/Mandrake)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jul 2008 16:47:16 -0000	1.1
+++ .cvsignore	3 Aug 2008 14:00:51 -0000	1.2
@@ -0,0 +1 @@
+aMule-2.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jul 2008 16:47:16 -0000	1.1
+++ sources	3 Aug 2008 14:00:51 -0000	1.2
@@ -0,0 +1 @@
+0aafdd159edb8ad5f0064da87998b47d  aMule-2.1.3.tar.bz2

More information about the rpmfusion-commits mailing list