From 3876cf72828232d4afec79e64ae02b97a0266a4f Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Jan 20 2016 15:38:47 +0000
Subject: New upstream release (2.5)


---

diff --git a/.gitignore b/.gitignore
index 7eb6a0e..a6c3c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 CCfits-2.2.tar.gz
 /CCfits-2.3.tar.gz
 /CCfits-2.4.tar.gz
+/CCfits-2.5.tar.gz
diff --git a/CCfits-1.6-removerpath.patch b/CCfits-1.6-removerpath.patch
deleted file mode 100644
index 63e21c4..0000000
--- a/CCfits-1.6-removerpath.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur CCfits/Makefile.in CCfits.rpath/Makefile.in
---- CCfits/Makefile.in	2009-09-09 17:48:28.000000000 +0200
-+++ CCfits.rpath/Makefile.in	2009-09-10 14:28:27.000000000 +0200
-@@ -244,12 +244,12 @@
- # generation like gcc does
- AUTOMAKE_OPTIONS = foreign # no-dependencies
- SUBDIRS = vs.net
--R_LIB_PATH = @RDFLAGS@
-+R_LIB_PATH = 
- MSVC_FILES = MSconfig.h
- EXTRA_DIST = config CHANGES README.INSTALL License.txt file1.pha $(MSVC_FILES)
- cookbook_SOURCES = cookbook.cxx
- cookbook_LDADD = libCCfits.la
--cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
-+cookbook_LDFLAGS = 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = CCfits.pc
- INCLUDES = -I$(top_srcdir)/..
-@@ -277,8 +277,8 @@
- 
- # This will tell shared library which STD C++ library to use without
- # needing the user to use LD_LIBRARY_PATH environment variable
--libCCfits_la_LIBADD = $(LIBSTDCPP)
--libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
-+libCCfits_la_LIBADD = 
-+libCCfits_la_LDFLAGS = 
- libCCfits_ladir = $(pkgincludedir)
- libCCfits_la_HEADERS = \
- 	AsciiTable.h				\
diff --git a/CCfits-2.5-removerpath.patch b/CCfits-2.5-removerpath.patch
new file mode 100644
index 0000000..8768254
--- /dev/null
+++ b/CCfits-2.5-removerpath.patch
@@ -0,0 +1,27 @@
+diff -ur CCfits/Makefile.in CCfits.norpath/Makefile.in
+--- CCfits/Makefile.in	2016-01-15 00:05:45.000000000 +0100
++++ CCfits.norpath/Makefile.in	2016-01-20 16:20:52.778792802 +0100
+@@ -310,12 +310,12 @@
+ # generation like gcc does
+ AUTOMAKE_OPTIONS = foreign # no-dependencies
+ SUBDIRS = vs.net
+-R_LIB_PATH = @RDFLAGS@
++R_LIB_PATH = 
+ MSVC_FILES = MSconfig.h
+ EXTRA_DIST = config CHANGES README.INSTALL License.txt file1.pha CMakeLists.txt FindCFITSIO.cmake $(MSVC_FILES)
+ cookbook_SOURCES = cookbook.cxx
+ cookbook_LDADD = libCCfits.la
+-cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
++cookbook_LDFLAGS = 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = CCfits.pc
+ INCLUDES = -I$(top_srcdir)/..
+@@ -344,7 +344,7 @@
+ # This will tell shared library which STD C++ library to use without
+ # needing the user to use LD_LIBRARY_PATH environment variable
+ libCCfits_la_LIBADD = $(LIBSTDCPP)
+-libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH)
++libCCfits_la_LDFLAGS = 
+ libCCfits_ladir = $(pkgincludedir)
+ libCCfits_la_HEADERS = \
+ 	AsciiTable.h				\
diff --git a/CCfits.spec b/CCfits.spec
index e12064f..f98f74a 100644
--- a/CCfits.spec
+++ b/CCfits.spec
@@ -1,13 +1,13 @@
 Name: CCfits
-Version: 2.4
-Release: 15%{?dist}
+Version: 2.5
+Release: 1%{?dist}
 Summary: A C++ interface for cfitsio
 
 Group: Development/Libraries
 License: BSD
 URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits
 Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/%{name}-%{version}.tar.gz
-Patch0: CCfits-1.6-removerpath.patch
+Patch0: CCfits-2.5-removerpath.patch
 
 BuildRequires: cfitsio-devel
 
@@ -51,7 +51,7 @@ make %{?_smp_mflags}  install DESTDIR=%{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%doc License.txt
+%license License.txt
 %{_libdir}/*so.*
 
 %files devel
@@ -63,9 +63,13 @@ make %{?_smp_mflags}  install DESTDIR=%{buildroot}
 %{_includedir}/*
 
 %files doc
-%doc License.txt html
+%license License.txt 
+%doc html
 
 %changelog
+* Wed Jan 20 2016 Sergio Pascual <sergiopr@fedoraproject.org> 2.5-1
+- New upstream release (2.5)
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index eaf74d3..0eda685 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd9a11d964590dd5f3fd5a3491b2c1ce  CCfits-2.4.tar.gz
+e77a679fc2b67cf38e53f4011821213b  CCfits-2.5.tar.gz