rpms/ed2k_hash/FC-6 ed2k_hash-64bit.patch, NONE, 1.1 ed2k_hash-warnings.patch, NONE, 1.1 ed2k_hash.desktop, 1.1, 1.2 ed2k_hash.spec, 1.1, 1.2

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/ed2k_hash/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363

Modified Files:
	ed2k_hash.desktop ed2k_hash.spec 
Added Files:
	ed2k_hash-64bit.patch ed2k_hash-warnings.patch 
Log Message:
backport from devel
- fix hash miscalculation on 64bit (bug #255321)
- fix compilation warnings
- fix desktop file
- fix license tag


ed2k_hash-64bit.patch:

--- NEW FILE ed2k_hash-64bit.patch ---
diff -up ed2k_hash-0.4.0/ed2k_hash/md4.h.64bit ed2k_hash-0.4.0/ed2k_hash/md4.h
--- ed2k_hash-0.4.0/ed2k_hash/md4.h.64bit	2002-09-04 19:24:37.000000000 +0200
+++ ed2k_hash-0.4.0/ed2k_hash/md4.h	2007-10-24 23:57:22.000000000 +0200
@@ -66,7 +66,7 @@ typedef unsigned char *POINTER;
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it

ed2k_hash-warnings.patch:

--- NEW FILE ed2k_hash-warnings.patch ---
diff -up ed2k_hash-0.4.0/ed2k_hash/cl_ui.c.w ed2k_hash-0.4.0/ed2k_hash/cl_ui.c
--- ed2k_hash-0.4.0/ed2k_hash/cl_ui.c.w	2003-02-14 10:39:34.000000000 +0100
+++ ed2k_hash-0.4.0/ed2k_hash/cl_ui.c	2007-10-24 23:26:21.000000000 +0200
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "global.h"
 
diff -up ed2k_hash-0.4.0/ed2k_hash/options.c.w ed2k_hash-0.4.0/ed2k_hash/options.c
--- ed2k_hash-0.4.0/ed2k_hash/options.c.w	2003-01-04 04:13:32.000000000 +0100
+++ ed2k_hash-0.4.0/ed2k_hash/options.c	2007-10-24 23:26:25.000000000 +0200
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "global.h"
 


Index: ed2k_hash.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/ed2k_hash/FC-6/ed2k_hash.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ed2k_hash.desktop	27 Sep 2006 17:59:23 -0000	1.1
+++ ed2k_hash.desktop	24 Oct 2007 22:28:38 -0000	1.2
@@ -6,5 +6,4 @@
 Icon=ed2k_hash.png
 Terminal=false
 Type=Application
-Categories=Application;Utility;
-Version=0.4.0
+Categories=Utility;


Index: ed2k_hash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ed2k_hash/FC-6/ed2k_hash.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ed2k_hash.spec	27 Sep 2006 17:59:23 -0000	1.1
+++ ed2k_hash.spec	24 Oct 2007 22:28:38 -0000	1.2
@@ -3,14 +3,16 @@
 Summary: Edonkey 2000 file hash calculator
 Name: ed2k_hash
 Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://ed2k-tools.sourceforge.net/index.shtml
 Group: Applications/File
 Source0: http://dl.sourceforge.net/sourceforge/ed2k-tools/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 # Taken from http://dl.sourceforge.net/sourceforge/ed2k-gtk-gui/ed2k-gtk-gui-0.6.4.tar.bz2
 Source2: ed2k-logo-mini.png
-License: GPL
+Patch0: %{name}-64bit.patch
+Patch1: %{name}-warnings.patch
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fltk-devel
 BuildRequires: desktop-file-utils
@@ -27,6 +29,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .64bit
+%patch1 -p1 -b .w
 
 %build
 %configure
@@ -70,6 +74,12 @@
 %{_iconsdir}/%{name}.png
 
 %changelog
+* Wed Oct 24 2007 Dominik Mierzejewski <rpm at greysector.net> 0.4.0-4
+- fix hash miscalculation on 64bit (bug #255321)
+- fix compilation warnings
+- fix desktop file
+- fix license tag
+
 * Wed Sep 27 2006 Dominik Mierzejewski <rpm at greysector.net> 0.4.0-3
 - run scripts for gui, not main package