rpms/cpl/F-8 cpl-cfitsiodyn.patch, NONE, 1.1 cpl-multilib.patch, NONE, 1.1 cpl.spec, 1.2, 1.3 sources, 1.2, 1.3 cpl-qfits.patch, 1.2, NONE

Sun Apr 6 18:36:23 UTC 2008

Author: sergiopr

Update of /cvs/pkgs/rpms/cpl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1266

Modified Files:
	cpl.spec sources 
Added Files:
	cpl-cfitsiodyn.patch cpl-multilib.patch 
Removed Files:
	cpl-qfits.patch 
Log Message:
* Sun Apr 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.1.0-1
- New upstream source


cpl-cfitsiodyn.patch:

--- NEW FILE cpl-cfitsiodyn.patch ---
diff -ur cpl-4.1.0/configure cpl-4.1.0.new/configure
--- cpl-4.1.0/configure	2008-03-06 17:28:39.000000000 +0100
+++ cpl-4.1.0.new/configure	2008-04-06 18:01:26.000000000 +0200
@@ -20406,7 +20406,7 @@
 echo $ECHO_N "checking for cfitsio... $ECHO_C" >&6
 
     cpl_cfitsio_check_header="fitsio.h"
-    cpl_cfitsio_check_lib="libcfitsio.a"
+    cpl_cfitsio_check_lib="libcfitsio.so"
 
     cpl_cfitsio_includes=""
     cpl_cfitsio_libraries=""
@@ -20443,7 +20443,6 @@
         done
     done
 
-
     # Check for the cfitsio library
     if test -z "$cpl_with_cfitsio_libs"; then
         test -n "$CFITSIODIR" && cpl_cfitsio_libdirs="$CFITSIODIR/lib"
@@ -20466,6 +20465,8 @@
         done
     done
 
+cpl_cfitsio_includes=/usr/include/cfitsio
+cpl_cfitsio_libraries=$libdir
 
     if test x"$cpl_cfitsio_includes" = xno || test x"$cpl_cfitsio_libraries" = xno; then
         { { echo "$as_me:$LINENO: error: cfitsio was not found on your system. Please check!" >&5

cpl-multilib.patch:

--- NEW FILE cpl-multilib.patch ---
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 17:40:32.000000000 +0100
@@ -27487,13 +27487,16 @@
 _CEXTEOF
                         fi
 
-                        if test -n "$cxint64"; then
                             cat >> $tcfgfile << _CEXTEOF
-
-CX_GNUC_EXTENSION typedef signed $cxint64 cxint64;
-CX_GNUC_EXTENSION typedef unsigned $cxint64 cxuint64;
+#include <bits/wordsize.h>
+#if __WORDSIZE == 32
+#include "cxtypes-32.h"
+#elif __WORDSIZE == 64
+#include "cxtypes-64.h"
+#else
+#error "Unknown word size"
+#endif
 _CEXTEOF
-                        fi
 
                         echo "" >> $tcfgfile
 
@@ -27504,13 +27507,17 @@
                             ;;
 
                         x4)
-                            echo "typedef cxint32 cxssize;" >> $tcfgfile
-                            echo "typedef cxuint32 cxsize;" >> $tcfgfile
+     echo "CX_GNUC_EXTENSION typedef signed $cxint64 cxint64;" > ${cfgfile/.h.in/-32.h} 
+     echo "CX_GNUC_EXTENSION typedef unsigned $cxint64 cxuint64;" >> ${cfgfile/.h.in/-32.h}
+         echo "typedef cxint32 cxssize;" >>  ${cfgfile/.h.in/-32.h}
+         echo "typedef cxuint32 cxsize;" >>  ${cfgfile/.h.in/-32.h}
                             ;;
 
                         x8)
-                            echo "typedef cxint64 cxssize;" >> $tcfgfile
-                            echo "typedef cxuint64 cxsize;" >> $tcfgfile
+     echo "CX_GNUC_EXTENSION typedef signed $cxint64 cxint64;" > ${cfgfile/.h.in/-64.h} 
+     echo "CX_GNUC_EXTENSION typedef unsigned $cxint64 cxuint64;" >> ${cfgfile/.h.in/-64.h}
+                            echo "typedef cxint64 cxssize;" >> ${cfgfile/.h.in/-64.h}
+                            echo "typedef cxuint64 cxsize;" >>  ${cfgfile/.h.in/-64.h}
                             ;;
                         *)
                             echo "#error size of size_t is unknown" >> \


Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-8/cpl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpl.spec	9 Oct 2007 11:07:03 -0000	1.2
+++ cpl.spec	6 Apr 2008 18:35:30 -0000	1.3
@@ -1,16 +1,17 @@
 Name: cpl
-Version: 3.1
-Release: 2%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
 Summary: ESO library for automated astronomical data-reduction tasks
 
 Group: Development/Libraries
 License: GPLv2+
 URL: http://www.eso.org/observing/cpl
 Source0: ftp://ftp.hq.eso.org/pub/cpl/%{name}-%{version}.tar.gz
-Patch0: cpl-qfits.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: cpl-cfitsiodyn.patch
+Patch1: cpl-multilib.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: qfits-devel
+BuildRequires: cfitsio-devel
 
 %description
 The Common Pipeline Library (CPL) comprises a set of ISO-C libraries 
@@ -25,7 +26,7 @@
 Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: qfits-devel
+Requires: cfitsio-devel
 %description devel
 This are the header files and libraries needed to develop a %{name}
 application
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -42,6 +44,8 @@
 %{__rm} -fr %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 %{__mkdir_p} %{buildroot}%{_libdir}/cplrecipes
+%{__install} -m 644 libcext/cext/cxtypes-32.h %{buildroot}%{_includedir} || :
+%{__install} -m 644 libcext/cext/cxtypes-64.h %{buildroot}%{_includedir} || :
 
 %clean
 %{__rm} -fr %{buildroot}
@@ -64,13 +68,24 @@
 %exclude %{_libdir}/*.la
 
 %changelog
-* Tue Oct 09 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-2
+* Sun Apr 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.1.0-1
+- New upstream source
+
+* Sat Feb 09 2008 Sergio Pascual <sergiopr at fedoraproject.org> 4.0.1-2
+- Updated upstream sources.
+- Fixing multilib bug (bz#340941)
+
+* Tue Oct 09 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-2
 - Updated qfits patch to build in 64 bits systems
-* Tue Sep 25 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.1-1
+
+* Tue Sep 25 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-1
 - Minor changes
-* Thu Sep 13 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.1-0.3
+
+* Thu Sep 13 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-0.3
 - Updated license tag
-* Thu May 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.1-0.2
+
+* Thu May 03 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-0.2
 - Added dir for recipes.
-* Thu Apr 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.1-0.1
+
+* Thu Apr 26 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-0.1
 - Initial spec file.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Oct 2007 07:32:32 -0000	1.2
+++ sources	6 Apr 2008 18:35:30 -0000	1.3
@@ -1 +1 @@
-b97abdebb563c302d147bb97978c321e  cpl-3.1.tar.gz
+006935c68cb23a1a5b80565836cd116f  cpl-4.1.0.tar.gz


--- cpl-qfits.patch DELETED ---


