rpms/mhash/devel mhash-0.9.9-multiarch.patch, NONE, 1.1 mhash.spec, 1.22, 1.23

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/mhash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3092

Modified Files:
	mhash.spec 
Added Files:
	mhash-0.9.9-multiarch.patch 
Log Message:
* Tue Oct 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-4
- Remove AC_CHECK_SIZEOF definitions from mhash_config.h
  since stdint.h is used. Add a guard after running configure.
  This shall fix the multiarch conflict in mhash-devel (#342601).


mhash-0.9.9-multiarch.patch:

--- NEW FILE mhash-0.9.9-multiarch.patch ---
diff -Nur mhash-0.9.9-orig/include/mutils/mhash_config.h.in mhash-0.9.9/include/mutils/mhash_config.h.in
--- mhash-0.9.9-orig/include/mutils/mhash_config.h.in	2007-04-05 04:21:23.000000000 +0200
+++ mhash-0.9.9/include/mutils/mhash_config.h.in	2007-10-23 15:04:18.000000000 +0200
@@ -202,21 +202,6 @@
 /* Define to 1 if the C compiler supports function prototypes. */
 #undef PROTOTYPES
 
-/* The size of `unsigned char', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_CHAR
-
-/* The size of `unsigned int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_INT
-
-/* The size of `unsigned long int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_INT
-
-/* The size of `unsigned long long int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG_LONG_INT
-
-/* The size of `unsigned short int', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_SHORT_INT
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 


Index: mhash.spec
===================================================================
RCS file: /cvs/extras/rpms/mhash/devel/mhash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mhash.spec	21 Aug 2007 16:50:58 -0000	1.22
+++ mhash.spec	23 Oct 2007 13:21:05 -0000	1.23
@@ -1,11 +1,12 @@
 Summary: Thread-safe hash algorithms library
 Name: mhash
 Version: 0.9.9
-Release: 3
+Release: 4
 URL: http://mhash.sourceforge.net/
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/mhash/mhash-%{version}.tar.bz2
+Patch1: mhash-0.9.9-multiarch.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Provides: libmhash = %{version}-%{release}
 
@@ -36,10 +37,15 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .multiarch
 
 
 %build
 %configure --enable-shared %{?_with_static: --enable-static} %{!?_with_static: --disable-static}
+
+# If this exits, the multiarch patch needs an update.
+grep 'define SIZEOF_' include/mutils/mhash_config.h && exit 1
+
 make %{?_smp_mflags}
 
 
@@ -84,6 +90,11 @@
 
 
 %changelog
+* Tue Oct 23 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.9-4
+- Remove AC_CHECK_SIZEOF definitions from mhash_config.h
+  since stdint.h is used. Add a guard after running configure.
+  This shall fix the multiarch conflict in mhash-devel (#342601).
+
 * Tue Aug 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt