[gearbox] handle 64-bit architectures as such

[Dan Horák]

commit 391f2fe4abdc9e7d0a3f3b7b985b4a3becdbd6c9
Author: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
Date:   Thu Oct 2 19:08:27 2014 +0200

    handle 64-bit architectures as such

 gearbox-64bit.patch     |   25 +++++++++++++++++++++++++
 gearbox-9.11.s390.patch |   13 -------------
 gearbox.spec            |   23 +++++++++++------------
 3 files changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/gearbox-64bit.patch b/gearbox-64bit.patch
new file mode 100644
index 0000000..1278537
--- /dev/null
+++ b/gearbox-64bit.patch
@@ -0,0 +1,25 @@
+Index: gearbox-10.11/cmake/SetupOs.cmake
+===================================================================
+--- gearbox-10.11.orig/cmake/SetupOs.cmake
++++ gearbox-10.11/cmake/SetupOs.cmake
+@@ -27,16 +27,10 @@ endif( APPLE )
+ 
+ if( GBX_OS_LINUX )
+     message( STATUS "Running on Linux" )
+-
+-    # 32 or 64 bit Linux
+-    # Set the library directory suffix accordingly
+-    IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-        SET (GBX_PROC_64BIT TRUE BOOL INTERNAL)
+-       MESSAGE (STATUS "Linux x86_64 Target Detected")
+-    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
+-        MESSAGE (STATUS "Linux ppc64 Target Detected")
+-        SET (GBX_PROC_64BIT TRUE BOOL INTERNAL)
+-    ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
++	IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
++       MESSAGE (STATUS "Linux 64-bit Target Detected")
++       SET (GBX_PROC_64BIT TRUE BOOL INTERNAL)
++    ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ endif( GBX_OS_LINUX )
+ 
+ if( GBX_OS_QNX )
diff --git a/gearbox.spec b/gearbox.spec
index a4713b9..a36c006 100644
--- a/gearbox.spec
+++ b/gearbox.spec
@@ -1,6 +1,6 @@
 Name:           gearbox
 Version:        10.11
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A collection of usable peer-reviewed robotics-related libraries
 
 Group:          Development/Libraries
@@ -11,10 +11,11 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:         gearbox-9.11.fixinstallpaths.patch
 # Fixes DSO-related link errors.  Not yet submitted upstream
 Patch1:         gearbox-9.11.fixdso.patch
-# Add detection of s390x architecture
-Patch2:         gearbox-9.11.s390.patch
 # Fix build errors with gcc-4.7
-Patch3:         gearbox-9.11.gcc47.patch
+Patch2:         gearbox-9.11.gcc47.patch
+# Mark any 64-bit architecture as such
+Patch3:         gearbox-64bit.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,12 +23,9 @@ BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 
-#ice isn't present on ppc64, just require it for non ppc64 systems
-%ifnarch ppc64
 BuildRequires:  ice-devel
 
 Requires:       ice
-%endif
 
 
 %description
@@ -44,9 +42,7 @@ Summary: Header files and libraries for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: cmake
-%ifnarch ppc64
 Requires: ice-devel
-%endif
 %description devel
 Contains the header files and libraries for %{name}. 
 If you like to develop programs using %{name},
@@ -58,9 +54,8 @@ you will need to install %{name}-devel.
 # Moves shared libraries from libdir/gearbox to libdir, as per FHS standards
 %patch0 -p1 -b .fixinstallpaths
 %patch1 -p1 -b .fixdso
-%patch2 -p1 -b .s390
-%patch3 -p0 -b .gcc48
-
+%patch2 -p0 -b .gcc48
+%patch3 -p1 -b .64bit
 %build
 %cmake \
   -DENABLE_LIB_FLEXIPORT=OFF \
@@ -117,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 02 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 10.11-8
+- handle 64-bit architectures as such
+- dropped s390x patch as not needed anymore
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild