rpms/cpl/devel cpl-multilib.patch,1.1,1.2 cpl.spec,1.4,1.5

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7258

Modified Files:
	cpl-multilib.patch cpl.spec 
Log Message:
* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0.1-2
- Updated upstream sources.
- Fixing multilib bug (bz#340941)


cpl-multilib.patch:

Index: cpl-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpl-multilib.patch	9 Feb 2008 15:57:58 -0000	1.1
+++ cpl-multilib.patch	9 Feb 2008 17:02:38 -0000	1.2
@@ -1,7 +1,7 @@
 diff -ur cpl-4.0/libcext/configure cpl-4.0.new/libcext/configure
 --- cpl-4.0/libcext/configure	2007-09-11 15:04:10.000000000 +0200
-+++ cpl-4.0.new/libcext/configure	2008-02-09 16:27:25.000000000 +0100
-@@ -27487,13 +27487,13 @@
++++ cpl-4.0.new/libcext/configure	2008-02-09 17:40:32.000000000 +0100
+@@ -27487,13 +27487,16 @@
  _CEXTEOF
                          fi
  
@@ -10,17 +10,20 @@
 -
 -CX_GNUC_EXTENSION typedef signed $cxint64 cxint64;
 -CX_GNUC_EXTENSION typedef unsigned $cxint64 cxuint64;
-+#ifdef __x86_64__ 
++#include <bits/wordsize.h>
++#if __WORDSIZE == 32
++#include "cxtypes-32.h"
++#elif __WORDSIZE == 64
 +#include "cxtypes-64.h"
 +#else
-+#include "cxtypes-32.h"
++#error "Unknown word size"
 +#endif
  _CEXTEOF
 -                        fi
  
                          echo "" >> $tcfgfile
  
-@@ -27504,13 +27504,17 @@
+@@ -27504,13 +27507,17 @@
                              ;;
  
                          x4)


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/cpl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpl.spec	9 Feb 2008 16:06:54 -0000	1.4
+++ cpl.spec	9 Feb 2008 17:02:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name: cpl
 Version: 4.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
@@ -68,11 +68,8 @@
 %exclude %{_libdir}/*.la
 
 %changelog
-* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0.1-1
+* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0.1-2
 - Updated upstream sources.
-
-* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0-1
-- Updated upstream sources. Now using cfitsio as FITS library
 - Fixing multilib bug (bz#340941)
 
 * Tue Oct 09 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-2