commit 98b0ada1af8dc8b124a23f15670ceda26d51cfd9
Author: Jakub Bogusz <[email protected]>
Date: Thu Mar 17 17:14:41 2016 +0100
- updated to 3.380 (note: new soname)
- updated zlib patch
- removed obsolete ldflags patch
cfitsio-ldflags.patch | 11 -----------
cfitsio-zlib.patch | 12 ++++++------
cfitsio.spec | 14 ++++++--------
3 files changed, 12 insertions(+), 25 deletions(-)
---
diff --git a/cfitsio.spec b/cfitsio.spec
index db2fd8c..76a1e7b 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,15 +1,14 @@
Summary: CFITSIO Interface Library
Summary(pl.UTF-8): Biblioteka interfejsu CFITSIO
Name: cfitsio
-Version: 3.370
+Version: 3.380
%define sver %(echo %{version} | tr -d .)
-Release: 2
+Release: 1
License: MIT-like
Group: Libraries
Source0:
ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/%{name}%{sver}.tar.gz
-# Source0-md5: abebd2d02ba5b0503c633581e3bfa116
-Patch0: %{name}-ldflags.patch
-Patch1: %{name}-zlib.patch
+# Source0-md5: a974409d527c0c527c88c12175786d21
+Patch0: %{name}-zlib.patch
URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
BuildRequires: gcc-g77
BuildRequires: zlib-devel
@@ -52,8 +51,7 @@ Statyczna wersja biblioteki CFITSIO.
%prep
%setup -q -n %{name}
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
# enforce headers from system zlib
%{__rm}
zlib/{crc32.h,deflate.h,inffast.h,inffixed.h,inflate.h,inftrees.h,zconf.h,zlib.h,zutil.h}
@@ -81,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc License.txt README docs/changes.txt
%attr(755,root,root) %{_libdir}/libcfitsio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcfitsio.so.2
+%attr(755,root,root) %ghost %{_libdir}/libcfitsio.so.4
%files devel
%defattr(644,root,root,755)
diff --git a/cfitsio-ldflags.patch b/cfitsio-ldflags.patch
deleted file mode 100644
index a8e670b..0000000
--- a/cfitsio-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in~ 2010-02-07 21:27:47.036321982 +0000
-+++ Makefile.in 2010-02-07 21:33:30.832955494 +0000
-@@ -32,7 +32,7 @@
- CC = @CC@
- CFLAGS = @CFLAGS@
- FC = @FC@
--LDFLAGS = $(CFLAGS)
-+LDFLAGS = @LDFLAGS@
- DEFS = @DEFS@
- LIBS = @LIBS@
- FLEX = flex
diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index 33029b3..33d2f5f 100644
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,6 +1,6 @@
---- cfitsio/Makefile.in.orig 2014-11-13 20:35:55.016255682 +0100
-+++ cfitsio/Makefile.in 2014-11-13 20:41:17.506242144 +0100
-@@ -63,9 +63,8 @@
+--- cfitsio/Makefile.in.orig 2016-01-08 18:27:12.000000000 +0100
++++ cfitsio/Makefile.in 2016-03-17 16:48:57.669945464 +0100
+@@ -66,9 +66,8 @@
pliocomp.c fits_hcompress.c fits_hdecompress.c \
simplerng.c
@@ -12,10 +12,10 @@
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
-@@ -98,7 +97,7 @@
- shared: libcfitsio${SHLIB_SUFFIX}
+@@ -101,7 +100,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
- libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm
${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz
${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cfitsio.git/commitdiff/98b0ada1af8dc8b124a23f15670ceda26d51cfd9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
