rpms/gpp4/devel gpp4-s390.patch,NONE,1.1 gpp4.spec,1.11,1.12

Dan Horák sharkcz at fedoraproject.org
Fri Jul 16 05:11:25 UTC 2010


Author: sharkcz

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

Modified Files:
	gpp4.spec 
Added Files:
	gpp4-s390.patch 
Log Message:
* Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 1.2.1-2
- fix build on s390(x)


gpp4-s390.patch:
 ccp4_sysdep.h |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE gpp4-s390.patch ---
diff -up gpp4-1.2.1/src/ccp4_sysdep.h.s390 gpp4-1.2.1/src/ccp4_sysdep.h
--- gpp4-1.2.1/src/ccp4_sysdep.h.s390	2010-07-15 21:49:20.000000000 +0200
+++ gpp4-1.2.1/src/ccp4_sysdep.h	2010-07-15 21:56:29.000000000 +0200
@@ -266,6 +266,11 @@
 #  define NATIVEFT DFNTF_BEIEEE
 #endif
 
+#if defined (__s390__) || defined (__s390x__)
+#  define NATIVEIT DFNTI_MBO
+#  define NATIVEFT DFNTF_BEIEEE
+#endif
+
 #ifdef __alpha
 #  ifdef VMS
 #    if __IEEE_FLOAT == 1


Index: gpp4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/gpp4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- gpp4.spec	26 Apr 2010 18:51:45 -0000	1.11
+++ gpp4.spec	16 Jul 2010 05:11:25 -0000	1.12
@@ -3,11 +3,12 @@
 Summary: Library providing specific CCP4 functionality 
 Name: gpp4
 Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://dmz-212.daimi.au.dk/~mok/%{name}/index.html
 Source0: http://launchpad.net/gpp4/trunk/1.2/+download/gpp4-%{version}.tar.gz
+Patch0: %{name}-s390.patch
 BuildRequires: doxygen
 BuildRequires: mmdb-devel
 BuildRequires: gcc-gfortran
@@ -60,6 +61,7 @@ development.
 
 %prep
 %setup -q
+%patch0 -p1 -b .s390
 
 %build
 %configure --disable-static
@@ -102,6 +104,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}f.pc
 
 %changelog
+* Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 1.2.1-2
+- fix build on s390(x)
+
 * Mon Apr 26 2010 Tim Fenn <fenn at stanford.edu> - 1.2.1-1
 - update to stable branch (1.2.1)
 - patches, autotool rebuild unecessary



More information about the scm-commits mailing list