diff --git a/.gitignore b/.gitignore index cec3e51..00b3242 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wcslib-4.3.1.tar.gz +/wcslib-4.5.6.tar.bz2 diff --git a/sources b/sources index 817bc27..75985d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ba90fbb6975472966f3aed17bbfbfd7 wcslib-4.3.1.tar.gz +b50030caa59010f4a50c5947647e431b wcslib-4.5.6.tar.bz2 diff --git a/wcslib-lm.patch b/wcslib-lm.patch deleted file mode 100644 index 6db126e..0000000 --- a/wcslib-lm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur wcslib-4.3.1/makedefs.in wcslib-4.3.1.new/makedefs.in ---- wcslib-4.3.1/makedefs.in 2007-12-27 06:57:22.000000000 +0100 -+++ wcslib-4.3.1.new/makedefs.in 2009-03-16 15:50:23.000000000 +0100 -@@ -107,7 +107,7 @@ - # Shared (dynamic) library (see note 3 above). - SHRLIB := @SHRLIB@ - SHRFLAGS := @SHRFLAGS@ -- SHRLD := @SHRLD@ -+ SHRLD := @SHRLD@ -lm - SHRLN := @SHRLN@ - - # Installation utilities and locations. diff --git a/wcslib.spec b/wcslib.spec index cc344f8..ade40d0 100644 --- a/wcslib.spec +++ b/wcslib.spec @@ -1,15 +1,13 @@ Name: wcslib -Version: 4.3.1 -Release: 3%{?dist} +Version: 4.5.6 +Release: 1%{?dist} Summary: An implementation of the FITS World Coordinate System standard Group: Development/Libraries # Library is under LGPLv3+ utils under GPLv3+ License: LGPLv3+ URL: http://www.atnf.csiro.au/people/mcalabre/WCS/ -Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.gz -Patch0: wcslib-lm.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.bz2 BuildRequires: cfitsio-devel zlib-devel %description @@ -25,7 +23,7 @@ Requires: wcslib = %{version}-%{release} These are the files needed to develop an application using %{name}. %package utils -Summary: Utility progrmas provided by %{name} +Summary: Utility programs provided by %{name} Group: Development/Libraries License: GPLv3+ Requires: wcslib = %{version}-%{release} @@ -34,7 +32,6 @@ Utils provided with %{name} %prep %setup -q -%patch0 -p1 %build %configure @@ -44,14 +41,16 @@ make %{?_smp_mflags} rm -rf %{buildroot} mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_libdir} +mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/%{_includedir}/wcslib install -m 755 utils/fitshdr %{buildroot}/%{_bindir} install -m 755 utils/HPXcvt %{buildroot}/%{_bindir} install -m 644 wcsconfig.h %{buildroot}/%{_includedir}/wcslib +install -m 644 wcslib.pc %{buildroot}/%{_libdir}/pkgconfig install -m 644 C/*.h %{buildroot}/%{_includedir}/wcslib -install -m 755 C/libwcs.so.4.3 %{buildroot}/%{_libdir} -ln -s libwcs.so.4.3 %{buildroot}/%{_libdir}/libwcs.so.4 -ln -s libwcs.so.4.3 %{buildroot}/%{_libdir}/libwcs.so +install -m 755 C/libwcs.so.%{version} %{buildroot}/%{_libdir} +ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so.4 +ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so %clean rm -rf %{buildroot} @@ -68,6 +67,7 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %{_libdir}/*.so +%{_libdir}/pkgconfig/wcslib.pc %{_includedir}/wcslib %files utils @@ -76,6 +76,10 @@ rm -rf %{buildroot} %{_bindir}/* %changelog +* Tue Nov 09 2010 Sergio Pascual 4.5.6-1 +- New upstream source +- Added pkgconfig file + * Mon Jul 27 2009 Fedora Release Engineering - 4.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild