rpms/gearbox/devel gearbox-9.11.s390.patch, NONE, 1.1 gearbox.spec, 1.2, 1.3

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/gearbox/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1989

Modified Files:
	gearbox.spec 
Added Files:
	gearbox-9.11.s390.patch 
Log Message:
* Sun Jun 20 2010 Dan Horák <dan[at]danny.cz> - 9.11-7
- add detection of s390x architecture


gearbox-9.11.s390.patch:
 SetupOs.cmake |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE gearbox-9.11.s390.patch ---
diff -up gearbox-9.11/cmake/SetupOs.cmake.s390 gearbox-9.11/cmake/SetupOs.cmake
--- gearbox-9.11/cmake/SetupOs.cmake.s390	2010-06-20 16:14:42.000000000 +0200
+++ gearbox-9.11/cmake/SetupOs.cmake	2010-06-20 16:15:27.000000000 +0200
@@ -36,6 +36,9 @@ if( GBX_OS_LINUX )
     ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
         MESSAGE (STATUS "Linux ppc64 Target Detected")
         SET (GBX_PROC_64BIT TRUE BOOL INTERNAL)
+    ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
+        MESSAGE (STATUS "Linux s390x Target Detected")
+        SET (GBX_PROC_64BIT TRUE BOOL INTERNAL)
     ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
 endif( GBX_OS_LINUX )
 


Index: gearbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gearbox/devel/gearbox.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gearbox.spec	19 Mar 2010 13:30:07 -0000	1.2
+++ gearbox.spec	20 Jun 2010 14:52:18 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gearbox
 Version:        9.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A collection of usable peer-reviewed robotics-related libraries
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ Patch0:         gearbox-9.11.fixinstallp
 Patch1:         gearbox-9.11.fixpkgconfig.patch
 # Fixes DSO-related link errors.  Not yet submitted upstream
 Patch2:         gearbox-9.11.fixdso.patch
+# Add detection of s390x architecture
+Patch3:         gearbox-9.11.s390.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +59,7 @@ you will need to install %{name}-devel.
 %patch0 -p1 -b .fixinstallpaths
 %patch1 -p1 -b .fixpkgconfig
 %patch2 -p1 -b .fixdso
+%patch3 -p1 -b .s390
 
 %build
 %cmake -DENABLE_LIB_BASICEXAMPLE=OFF -DENABLE_LIB_GBXUTILACFR=ON -DENABLE_LIB_GBXGARMINACFR=ON -DENABLE_LIB_GBXSERIALACFR=ON -DHOKUYO_AIST_BUILD_BINDINGS=OFF -DGBX_BUILD_TESTS=ON -DCMAKE_SKIP_RPATH:BOOL=ON\
@@ -106,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 20 2010 Dan Horák <dan[at]danny.cz> - 9.11-7
+- add detection of s390x architecture
+
 * Fri Mar 19 2010 Mary Ellen Foster <mefoster at gmail.com> - 9.11-6
 - Rebuild with new Ice