rpms/kannel/devel gateway-1.4.1-ssl64bit.patch, NONE, 1.1 gateway-1.4.1-typesh.patch, NONE, 1.1 gw-config, NONE, 1.1 kannel.spec, 1.17, 1.18

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv920

Modified Files:
	kannel.spec 
Added Files:
	gateway-1.4.1-ssl64bit.patch gateway-1.4.1-typesh.patch 
	gw-config 
Log Message:
Fix ssl on x86_64 and fix multilib conflicts.


gateway-1.4.1-ssl64bit.patch:

--- NEW FILE gateway-1.4.1-ssl64bit.patch ---
diff -Naupr gateway-1.4.1.orig/configure gateway-1.4.1/configure
--- gateway-1.4.1.orig/configure	2006-06-06 16:02:58.000000000 +0200
+++ gateway-1.4.1/configure	2008-12-22 14:44:41.092245736 +0100
@@ -10217,7 +10217,7 @@ fi;
 
 if test "$ssl" = "yes" ; then
     if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/local/ssl/lib /usr/local/openssl/lib; do
+    for loc in /usr/lib64 /usr/lib /usr/local/ssl/lib /usr/local/openssl/lib; do
       if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
         ssllib="$loc"
       fi

gateway-1.4.1-typesh.patch:

--- NEW FILE gateway-1.4.1-typesh.patch ---
diff -Naupr gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in gateway-1.4.1/gwlib/gw_uuid_types.h.in
--- gateway-1.4.1.orig/gwlib/gw_uuid_types.h.in	2003-12-08 12:25:44.000000000 +0100
+++ gateway-1.4.1/gwlib/gw_uuid_types.h.in	2008-12-22 15:16:18.678371529 +0100
@@ -3,49 +3,7 @@
  * everything we need.  (cross fingers)  Other header files may have 
  * also defined the types that we need.
  */
-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-	!defined(_UUID_TYPES) && !defined(_EXT2_TYPES_H))
-#define _UUID_TYPES_H
-
-typedef unsigned char __u8;
-typedef signed char __s8;
-
-#if (@SIZEOF_INT@ == 8)
-typedef int		__s64;
-typedef unsigned int	__u64;
-#elif (@SIZEOF_LONG@ == 8)
-typedef long		__s64;
-typedef unsigned long	__u64;
-#elif (@SIZEOF_LONG_LONG@ == 8)
-#if defined(__GNUC__)
-typedef __signed__ long long 	__s64;
-#else
-typedef signed long long 	__s64;
-#endif
-typedef unsigned long long	__u64;
-#endif
-
-#if (@SIZEOF_INT@ == 2)
-typedef	int		__s16;
-typedef	unsigned int	__u16;
-#elif (@SIZEOF_SHORT@ == 2)
-typedef	short		__s16;
-typedef	unsigned short	__u16;
-#else
-  ?==error: undefined 16 bit type
-#endif
-
-#if (@SIZEOF_INT@ == 4)
-typedef	int		__s32;
-typedef	unsigned int	__u32;
-#elif (@SIZEOF_LONG@ == 4)
-typedef	long		__s32;
-typedef	unsigned long	__u32;
-#elif (@SIZEOF_SHORT@ == 4)
-typedef	short		__s32;
-typedef	unsigned short	__u32;
-#else
- ?== error: undefined 32 bit type
+#if (!defined(_LINUX_TYPES_H))
+#include <linux/types.h>
 #endif
 
-#endif /* _*_TYPES_H */


--- NEW FILE gw-config ---
#!/bin/sh
#
# Fedora specific hack in order to have an identical script across all archs
# which won't create multilib conflicts.

# Always prefer 64bit over 32bit, hardcode the multilib archs here
for ARCH in x86_64 ia64 s390; do
    [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
done

# No multilib, execute the first one found (there should be only one anyway)
CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)

if [ -x "${CONFIGSCRIPT}" ]; then
    exec ${CONFIGSCRIPT}
else
    echo "Not a single /usr/bin/gw-config-* script found. Please check why."
    exit 1
fi



Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kannel.spec	20 Feb 2008 04:17:42 -0000	1.17
+++ kannel.spec	22 Dec 2008 15:22:44 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.1
-Release: 7
+Release: 8
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,6 +9,9 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
+Source4: gw-config
+Patch0: gateway-1.4.1-ssl64bit.patch
+Patch1: gateway-1.4.1-typesh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex, ghostscript
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
@@ -47,6 +50,8 @@
 
 %prep
 %setup -q -n gateway-%{version}
+%patch0 -p1 -b .ssl64bit
+%patch1 -p1 -b .typesh
 
 
 %build
@@ -79,6 +84,10 @@
         %{buildroot}%{_sbindir}/start-stop-kannel
 # Remove executable bit from man pages (as of 1.4.1)
 %{__chmod} -x %{buildroot}%{_mandir}/man?/*
+# Multilib fix : Replace the gw-config with our wrapper script
+%{__mv} %{buildroot}%{_bindir}/gw-config \
+        %{buildroot}%{_bindir}/gw-config.%{_arch}
+%{__install} -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/gw-config
 
 
 %clean
@@ -125,17 +134,22 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/gw-config
+%{_bindir}/gw-config*
 %{_includedir}/kannel/
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.1-7
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.1-8
+- Include patch to fix openssl detection on 64bit.
+- Include gw-config wrapper script to fix multilib conflicts (#341701).
+- Include patch to remove definitions of types which never happen on Linux.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
-* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.4.1-6
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org>
 - Rebuild for deps
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-5