rpms/multiget/F-9 MultiGet.png, NONE, 1.1 import.log, NONE, 1.1 multiget-1.2-fix-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 multiget.desktop, 1.1, 1.2 multiget.spec, 1.2, 1.3 sources, 1.2, 1.3 multiget-1.1.4-makefile.patch, 1.1, NONE

Wed Jul 2 16:33:44 UTC 2008

Author: guidoledermann

Update of /cvs/pkgs/rpms/multiget/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5549/F-9

Modified Files:
	.cvsignore multiget.desktop multiget.spec sources 
Added Files:
	MultiGet.png import.log multiget-1.2-fix-gcc43.patch 
Removed Files:
	multiget-1.1.4-makefile.patch 
Log Message:

--- NEW FILE import.log ---
multiget-1_2_0-3_fc9:F-9:multiget-1.2.0-3.fc9.src.rpm:1215016339

multiget-1.2-fix-gcc43.patch:

--- NEW FILE multiget-1.2-fix-gcc43.patch ---
diff -dur multiget.orig/src/batch.cpp multiget/src/batch.cpp
--- multiget.orig/src/batch.cpp	2007-01-13 12:09:02.000000000 +0100
+++ multiget/src/batch.cpp	2008-06-04 20:17:12.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
+
+#include <cstdlib>
 #include "batch.h"
 #include "common.h"
 #include <iostream>
diff -dur multiget.orig/src/common.cpp multiget/src/common.cpp
--- multiget.orig/src/common.cpp	2007-01-13 12:09:02.000000000 +0100
+++ multiget/src/common.cpp	2008-06-04 20:17:10.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
+
+#include <cstdlib>
 #include "common.h"
 #include "speedctrl.h"
 #include "mirroradmin.h"
diff -dur multiget.orig/src/mgftpbase.cpp multiget/src/mgftpbase.cpp
--- multiget.orig/src/mgftpbase.cpp	2007-01-13 12:09:02.000000000 +0100
+++ multiget/src/mgftpbase.cpp	2008-06-04 20:17:08.000000000 +0200
@@ -21,7 +21,8 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
+
+#include <cstdlib>
 #ifdef WIN32
 #include <winsock2.h>
 #endif
diff -dur multiget.orig/src/mgurlparser.cpp multiget/src/mgurlparser.cpp
--- multiget.orig/src/mgurlparser.cpp	2007-01-29 04:51:58.000000000 +0100
+++ multiget/src/mgurlparser.cpp	2008-06-04 20:17:13.000000000 +0200
@@ -22,6 +22,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <cstdlib>
+#include <cstring>
 
 #include "mgurlparser.h"
 #include "common.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multiget/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Mar 2007 02:40:56 -0000	1.2
+++ .cvsignore	2 Jul 2008 16:32:56 -0000	1.3
@@ -1 +1 @@
-multiget-1.1.4.src.tar.gz
+multiget-1.2.0.src.tar.bz2


Index: multiget.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/multiget/F-9/multiget.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multiget.desktop	22 Mar 2007 02:40:56 -0000	1.1
+++ multiget.desktop	2 Jul 2008 16:32:56 -0000	1.2
@@ -1,10 +1,12 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
 Name=MultiGet
 GenericName=MultiGet file downloader
 Comment=File downloader
-Exec=MultiGet
+Exec=multiget
 Icon=MultiGet.png
 Terminal=false
 Type=Application
 Categories=GTK;GNOME;Network;FileTransfer;
+GenericName[de_DE]=MultiGet file downloader


Index: multiget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multiget/F-9/multiget.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multiget.spec	18 Feb 2008 19:15:06 -0000	1.2
+++ multiget.spec	2 Jul 2008 16:32:56 -0000	1.3
@@ -1,18 +1,21 @@
 Name:           multiget
-Version:        1.1.4
-Release:        8%{?dist}
+Version:        1.2.0
+Release:        3%{?dist}
 Summary:        An easy-to-use GUI file downloader
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://multiget.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.src.tar.bz2
 Source1:        multiget.desktop
 Source2:        COPYING
-Patch0:         multiget-1.1.4-makefile.patch
+# There is no symbol for multiget provided in 1.2.0 like it has been in 1.1.4
+# so I decided to use the one from 1.1.4.
+Source3:        MultiGet.png
+Patch0:         multiget-1.2-fix-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  wxGTK-devel desktop-file-utils >= 0.9
+BuildRequires:  wxGTK-devel desktop-file-utils >= 0.9 perl(XML::Parser) libglade2-devel automake >= 1.10
 
 %description
 MultiGet is an easy-to-use GUI file downloader. 
@@ -24,18 +27,31 @@
 http proxy.
 
 %prep
-%setup -q
+%setup -qn multiget
 %patch0 -p1 -b .good
-# Fix script-without-shebangs in debuginfo package
-chmod 644 src/icons/*.xpm
-chmod 644 src/newicons/16/*.xpm
-chmod 644 src/newicons/24/*.xpm
-chmod 644 src/newicons/32/*.xpm
-chmod 644 src/newicons/48/*.xpm
-cp %{SOURCE2} %{_builddir}/%{name}-%{version}/
+chmod 644 icons/*.xpm
+
+# fix dead symbolic links
+rm -f INSTALL
+ln -s %{_datadir}/automake-1.10/INSTALL INSTALL
+rm -f install-sh 
+ln -s %{_datadir}/automake-1.10/install-sh install-sh 
+rm -f depcomp
+ln -s %{_datadir}/automake-1.10/depcomp depcomp
+rm -f missing
+ln -s %{_datadir}/automake-1.10/missing missing
+rm -f %{_builddir}/%{name}/COPYING
+cp -p %{SOURCE2} %{_builddir}/%{name}/
+
+chmod 644 icons/*.xpm
+chmod 644 newicons/16/*.xpm
+chmod 644 newicons/24/*.xpm
+chmod 644 newicons/32/*.xpm
+chmod 644 newicons/48/*.xpm
+
 
 %build
-cd src/
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -44,26 +60,30 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-install -m 755 src/MultiGet $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 644 MultiGet.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+install -p -m 755 src/multiget $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 desktop-file-install --vendor=fedora \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc changelog.txt readme_en.txt COPYING
-%{_bindir}/MultiGet
+%doc COPYING
+%{_bindir}/multiget
 %{_datadir}/applications/fedora-multiget.desktop
 %{_datadir}/pixmaps/MultiGet.png
 
 %changelog
+* Thu Jun 12 2008 Guido Ledermann <guido.ledermann at googlemail.com> - 1.2.0-3
+- remove patch for Makefile.in, fixed spec to follow Packaging Guidelines
+* Thu Jun 12 2008 Guido Ledermann <guido.ledermann at googlemail.com> - 1.2.0-2
+- remove patch for Makefile and added patch for Makefile.ini, fixed spec
+* Thu Jun 05 2008 Guido Ledermann <guido.ledermann at googlemail.com> - 1.2.0-1
+- Fixed for 1.2.0 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.4-8
 - Autorebuild for GCC 4.3
-
 * Sun Mar 14 2007 Allisson Azevedo <allisson at gmail.com> 1.1.4-7
 - Change patch
 * Sun Mar 14 2007 Allisson Azevedo <allisson at gmail.com> 1.1.4-6


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multiget/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Mar 2007 02:40:56 -0000	1.2
+++ sources	2 Jul 2008 16:32:56 -0000	1.3
@@ -1 +1 @@
-afb1de0ccf51a0255960c437e03e83a5  multiget-1.1.4.src.tar.gz
+b62c4017ad2180cfa8b466e2bd320e40  multiget-1.2.0.src.tar.bz2


--- multiget-1.1.4-makefile.patch DELETED ---


