rpms/ice/devel Ice-3.4.0-s390.patch,NONE,1.1 ice.spec,1.39,1.40

[Dan Horák]

Author: sharkcz

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

Modified Files:
	ice.spec 
Added Files:
	Ice-3.4.0-s390.patch 
Log Message:
* Sun Jun 20 2010 Dan Horák <dan[at]danny.cz> - 3.4.0-2
- add support for the s390/s390x architectures


Ice-3.4.0-s390.patch:
 Config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Ice-3.4.0-s390.patch ---
diff -up Ice-3.4.0/cpp/include/IceUtil/Config.h.s390 Ice-3.4.0/cpp/include/IceUtil/Config.h
--- Ice-3.4.0/cpp/include/IceUtil/Config.h.s390	2010-06-20 10:57:34.000000000 +0200
+++ Ice-3.4.0/cpp/include/IceUtil/Config.h	2010-06-20 10:59:38.000000000 +0200
@@ -26,7 +26,7 @@
 #   define ICE_LITTLE_ENDIAN
 #elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
       defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
-      defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
+      defined(__MIPSEB__) || defined(__s390__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN))
 #   define ICE_BIG_ENDIAN
 #else
 #   error "Unknown architecture"
@@ -42,7 +42,7 @@
 //
 #   define  ICE_32
 #elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64))  || \
-      defined(__linux) && defined(__x86_64)                        || \
+      defined(__linux) && (defined(__x86_64) || defined(__s390x__)) || \
       defined(__hppa) && defined(__LP64__)                         || \
       defined(_ARCH_COM) && defined(__64BIT__)                     || \
       defined(__alpha__)                                           || \


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ice.spec	12 Mar 2010 15:16:43 -0000	1.39
+++ ice.spec	20 Jun 2010 11:45:26 -0000	1.40
@@ -7,7 +7,7 @@
 
 Name: ice
 Version: 3.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -38,6 +38,9 @@ Patch4:		Ice-rpmbuild-change-user.patch
 # http://www.zeroc.com/forums/attachments/patches/745d1268183564-patch-1-ice-3-4-0-slice2cpp-stream-issue-patch-stream.txt
 Patch5:		patch-stream.txt
 
+# Add support for the s390/s390x architecture
+Patch6:         Ice-3.4.0-s390.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support ppc64 at all
@@ -194,6 +197,7 @@ Tools for developing Ice applications in
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
+%patch6 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %patch4 -p1
 %setup -q -n Ice-3.3.0-man-pages -T -b 2
@@ -283,7 +287,7 @@ mv $RPM_BUILD_ROOT/include/* ${RPM_BUILD
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 # There are a couple of files that end up installed in /lib, not %{_libdir},
 # so we try this move too.
-mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir} || true
 mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || true
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
 mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
@@ -539,6 +543,9 @@ fi
 %{_bindir}/slice2php
 
 %changelog
+* Sun Jun 20 2010 Dan Horák <dan[at]danny.cz> - 3.4.0-2
+- add support for the s390/s390x architectures
+
 * Fri Mar 12 2010 Mary Ellen Foster <mefoster at gmail.com> - 3.4.0-1
 - Update to new upstream release -- complete release notes at
   http://www.zeroc.com/download/Ice/3.4/Ice-3.4.0-RELEASE_NOTES