rpms/ed2k_hash/devel ed2k_hash-64bit.patch, 1.1, 1.2 ed2k_hash.spec, 1.3, 1.4

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Wed Oct 24 22:00:14 UTC 2007


Author: rathann

Update of /cvs/pkgs/rpms/ed2k_hash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21247

Modified Files:
	ed2k_hash-64bit.patch ed2k_hash.spec 
Log Message:
- simplify 64bit patch


ed2k_hash-64bit.patch:

Index: ed2k_hash-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ed2k_hash/devel/ed2k_hash-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ed2k_hash-64bit.patch	24 Oct 2007 21:45:02 -0000	1.1
+++ ed2k_hash-64bit.patch	24 Oct 2007 22:00:07 -0000	1.2
@@ -1,34 +1,12 @@
 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:38:16.000000000 +0200
-@@ -58,15 +58,16 @@
- #ifndef PROTOTYPES
- #define PROTOTYPES 0
- #endif
-+#include <inttypes.h>
- 
- /* POINTER defines a generic pointer type */
- typedef unsigned char *POINTER;
- 
- /* UINT2 defines a two byte word */
--typedef unsigned short int UINT2;
-+typedef uint16_t UINT2;
++++ 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 uint32_t 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
-diff -up ed2k_hash-0.4.0/configure.ac.64bit ed2k_hash-0.4.0/configure.ac
---- ed2k_hash-0.4.0/configure.ac.64bit	2004-01-09 22:14:39.000000000 +0100
-+++ ed2k_hash-0.4.0/configure.ac	2007-10-24 23:38:52.000000000 +0200
-@@ -19,6 +19,8 @@ AM_CONFIG_HEADER(config.h)
- 
- AC_LANG_CPLUSPLUS
- 
-+AC_CHECK_HEADERS([inttypes.h])
-+
- dnl ==============================================================
- dnl Check for the FLTK toolkit.
- dnl


Index: ed2k_hash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ed2k_hash/devel/ed2k_hash.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ed2k_hash.spec	24 Oct 2007 21:45:02 -0000	1.3
+++ ed2k_hash.spec	24 Oct 2007 22:00:07 -0000	1.4
@@ -14,7 +14,6 @@
 Patch1: %{name}-warnings.patch
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
 BuildRequires: fltk-devel
 BuildRequires: desktop-file-utils
 
@@ -34,7 +33,6 @@
 %patch1 -p1 -b .w
 
 %build
-autoreconf -f -i
 %configure
 %{__make} %{?_smp_mflags}
 




More information about the fedora-extras-commits mailing list