rpms/cln/devel cln-1.2.2-s390x.patch,NONE,1.1 cln.spec,1.31,1.32

Dan Horák sharkcz at fedoraproject.org
Thu May 28 10:19:54 UTC 2009


Author: sharkcz

Update of /cvs/pkgs/rpms/cln/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24887

Modified Files:
	cln.spec 
Added Files:
	cln-1.2.2-s390x.patch 
Log Message:
* Thu May 28 2009 Dan Horak <dan[at]danny.cz> - 1.2.2-5
- fix build on s390x
- run the test-suite during build


cln-1.2.2-s390x.patch:

--- NEW FILE cln-1.2.2-s390x.patch ---
--- cln-1.2.2/include/cln/types.h.orig	2009-05-28 09:34:49.000000000 +0200
+++ cln-1.2.2/include/cln/types.h	2009-05-28 09:39:04.000000000 +0200
@@ -48,7 +48,7 @@
     #undef HAVE_LONGLONG
    #endif
   #endif
-  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__))
+  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__))
     // 64 bit registers in hardware
     #define HAVE_FAST_LONGLONG
   #endif
@@ -127,7 +127,7 @@
     typedef int sintD;
     typedef unsigned int uintD;
   #else  // we are not using GMP, so just guess something reasonable
-    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)))
+    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)))
       #define intDsize 64
       typedef sint64  sintD;
       typedef uint64  uintD;


Index: cln.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cln/devel/cln.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- cln.spec	24 Feb 2009 07:54:56 -0000	1.31
+++ cln.spec	28 May 2009 10:19:23 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://www.ginac.de/CLN/
 Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
 Patch0:		cln-upstream_gcc44_fix.patch
+Patch1:		cln-1.2.2-s390x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -36,6 +37,7 @@ the CLN library.
 %prep
 %setup -q
 %patch0 -p1 -b .gcc44
+%patch1 -p1 -b .s390x
 
 %build
 %configure --disable-static
@@ -51,6 +53,9 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%check
+make %{_smp_mflags} check
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -78,6 +83,10 @@ fi
 %exclude %{_libdir}/*.la
 
 %changelog
+* Thu May 28 2009 Dan Horak <dan[at]danny.cz> - 1.2.2-5
+- fix build on s390x
+- run the test-suite during build
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the scm-commits mailing list