rpms/cpl/devel cpl-cfitsiodyn.patch, NONE, 1.1 cpl-multilib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cpl.spec, 1.2, 1.3 sources, 1.2, 1.3 cpl-qfits.patch, 1.2, NONE
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Sat Feb 9 15:58:33 UTC 2008
Author: sergiopr
Update of /cvs/pkgs/rpms/cpl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22162
Modified Files:
.cvsignore cpl.spec sources
Added Files:
cpl-cfitsiodyn.patch cpl-multilib.patch
Removed Files:
cpl-qfits.patch
Log Message:
* 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)
cpl-cfitsiodyn.patch:
--- NEW FILE cpl-cfitsiodyn.patch ---
diff -ur cpl-4.0/configure cpl-4.0.new/configure
--- cpl-4.0/configure 2007-09-11 15:04:39.000000000 +0200
+++ cpl-4.0.new/configure 2007-11-09 15:55:17.000000000 +0100
@@ -20184,7 +20184,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=""
@@ -20227,7 +20227,7 @@
# Check for the cfitsio includes
if test -z "$cpl_with_cfitsio_includes"; then
- cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include"
+ cpl_cfitsio_incdirs="/opt/cfitsio/include /usr/local/include /usr/include /usr/include/cfitsio"
test -n "$CPLDIR" && cpl_cfitsio_incdirs="$CPLDIR/include \
$cpl_cfitsio_incdirs"
@@ -20259,7 +20259,7 @@
# Check for the cfitsio library
if test -z "$cpl_with_cfitsio_libs"; then
- cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib /usr/lib"
+ cpl_cfitsio_libdirs="/opt/cfitsio/lib /usr/local/lib $libdir"
test -n "$CPLDIR" && cpl_cfitsio_libdirs="$CPLDIR/lib \
$cpl_cfitsio_libdirs"
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 16:27:25.000000000 +0100
@@ -27487,13 +27487,13 @@
_CEXTEOF
fi
- if test -n "$cxint64"; then
cat >> $tcfgfile << _CEXTEOF
-
-CX_GNUC_EXTENSION typedef signed $cxint64 cxint64;
-CX_GNUC_EXTENSION typedef unsigned $cxint64 cxuint64;
+#ifdef __x86_64__
+#include "cxtypes-64.h"
+#else
+#include "cxtypes-32.h"
+#endif
_CEXTEOF
- fi
echo "" >> $tcfgfile
@@ -27504,13 +27504,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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Oct 2007 07:32:32 -0000 1.2
+++ .cvsignore 9 Feb 2008 15:57:58 -0000 1.3
@@ -1 +1 @@
-cpl-3.1.tar.gz
+cpl-4.0.tar.gz
Index: cpl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpl/devel/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 9 Feb 2008 15:57:58 -0000 1.3
@@ -1,16 +1,17 @@
Name: cpl
-Version: 3.1
-Release: 2%{?dist}
+Version: 4.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,21 @@
%exclude %{_libdir}/*.la
%changelog
-* Tue Oct 09 2007 Sergio Pascual <sergiopr at fedoraproject.org> 3.1-2
+* 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
- 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/devel/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 9 Feb 2008 15:57:58 -0000 1.3
@@ -1 +1 @@
-b97abdebb563c302d147bb97978c321e cpl-3.1.tar.gz
+865a1b561f3f883c122738ce3a0aa6e6 cpl-4.0.tar.gz
--- cpl-qfits.patch DELETED ---
More information about the fedora-extras-commits
mailing list