From 5a8a983b3df27988c440b76d01bbdbe944fdb262 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sat, 16 Apr 2016 00:29:30 +0200 Subject: [PATCH] - update to 3.17.2 - drop patches which are already merged in upstream --- .gitignore | 1 + libdap.spec | 19 ++++++------------- sources | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 052f5e5..8f67cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libdap-3.10.2.tar.gz /libdap-3.16.0.tar.gz /libdap-3.17.0.tar.gz /version-3.17.1.tar.gz +/libdap-3.17.2.tar.gz diff --git a/libdap.spec b/libdap.spec index 1900e9c..4f05937 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,22 +1,14 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.17.1 +Version: 3.17.2 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://www.opendap.org/ -#Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz -Source0: https://github.com/OPENDAP/libdap4/archive/version-%{version}.tar.gz +Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz #Don't run HTTP tests - builders don't have network connections Patch0: libdap-offline.patch -# Add missing big endian baselines -# https://github.com/OPENDAP/libdap4/pull/13 -# https://bugzilla.redhat.com/show_bug.cgi?id=1325114 -Patch1: libdap-big-endian-baselines.patch -# Fix cppunit detection -# https://github.com/OPENDAP/libdap4/pull/15 -Patch2: libdap-cppunit.patch # For autoreconf BuildRequires: libtool @@ -69,10 +61,8 @@ Documentation of the libdap library. %prep -%setup -q -n %{name}4-version-%{version} +%setup -q -n %{name}-%{version} %patch0 -p1 -b .offline -%patch1 -p1 -b .big-endian-baselines -%patch2 -p1 -b .cppunit iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -141,6 +131,9 @@ make check %changelog +* Fri Apr 15 2016 Than Ngo - 3.17.2-1 +- update to 3.17.2 + * Fri Apr 15 2016 Dan HorĂ¡k - 3.17.1-1 - Update to 3.17.1 - Switch to github for source archive diff --git a/sources b/sources index ac6cb08..54ef4aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2232538779402ee0384e4ee1c883584 version-3.17.1.tar.gz +d8051a36df74a13d1bb912fe9704776f libdap-3.17.2.tar.gz