diff --git a/.gitignore b/.gitignore index f9371f2..8f394a8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libaec-1.0.1.tar.gz /libaec-1.0.2.tar.gz /libaec-v1.0.3.tar.gz +/121B2TestData.zip diff --git a/libaec.spec b/libaec.spec index e7cbefc..b874442 100644 --- a/libaec.spec +++ b/libaec.spec @@ -1,10 +1,11 @@ Name: libaec Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adaptive Entropy Coding library License: BSD Url: https://gitlab.dkrz.de/k202009/libaec -Source: https://gitlab.dkrz.de/k202009/libaec/-/archive/v%{version}/libaec-v%{version}.tar.gz +Source0: https://gitlab.dkrz.de/k202009/libaec/-/archive/v%{version}/libaec-v%{version}.tar.gz +Source1: http://cwe.ccsds.org/sls/docs/SLS-DC/BB121B2TestData/121B2TestData.zip BuildRequires: gcc BuildRequires: %{?fedora:cmake >= 3.1}%{?rhel:cmake3 >= 3.1} @@ -32,7 +33,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Devel files for libaec (Adaptive Entropy Coding library). %prep -%setup -q -n %{name}-v%{version} +%setup -q -n %{name}-v%{version} -a 1 +mv 121B2TestData data +mv data/121B2TestData/AllOptions/test_P512n22.dat data/121B2TestData/AllOptions/test_p512n22.dat %build mkdir build @@ -45,8 +48,7 @@ popd %make_install -C build %check -#test data missing in tarball for check_szcomp and sampledata.sh -make -C build test CTEST_OUTPUT_ON_FAILURE=1 ARGS="-E \(check_szcomp\|sampledata.sh\)" +make -C build test CTEST_OUTPUT_ON_FAILURE=1 %ldconfig_scriptlets @@ -62,6 +64,9 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 ARGS="-E \(check_szcomp\|sampledata %{_libdir}/lib*.so %changelog +* Tue Feb 05 2019 Christoph Junghans - 1.0.3-2 +- Enable all tests + * Mon Feb 04 2019 Christoph Junghans - 1.0.3-1 - Version bump to 1.0.3 (bug #1672326) diff --git a/sources b/sources index 53906cb..33e666f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (libaec-v1.0.3.tar.gz) = 26c904fc6122772e809e1e6bf9d76e2b18eda6fff562aa5c82fdd9eb12c2a6381d42329c0e8957b3c68ed47999a6aee16cfdb4e0d904e3cb1d51b52f88ad4690 +SHA512 (121B2TestData.zip) = de74397445478ee7d84851b0d3ef3d012388ce26fe7279441d4c85a2cde11e26ab47d851c23faa996ae7bb87965b7555e0ac3337e5f54287b10d3238f55a45fd