From b02e930483c97ffc1a9375b92b50ded3b0387c79 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 4 Feb 2019 13:41:29 -0700 Subject: [PATCH] Version bump to 1.0.3 (bug #1672326) --- .gitignore | 1 + 0001-cmake-only-enable-C-not-C.patch | 25 ------------------------- libaec.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 0001-cmake-only-enable-C-not-C.patch diff --git a/.gitignore b/.gitignore index 25df452..f9371f2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libaec-*.src.rpm /libaec-1.0.1.tar.gz /libaec-1.0.2.tar.gz +/libaec-v1.0.3.tar.gz diff --git a/0001-cmake-only-enable-C-not-C.patch b/0001-cmake-only-enable-C-not-C.patch deleted file mode 100644 index c7da8a7..0000000 --- a/0001-cmake-only-enable-C-not-C.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b50ec6181248fa8905e4457474a3f6dde404ae8e Mon Sep 17 00:00:00 2001 -From: Christoph Junghans -Date: Sat, 24 Feb 2018 15:44:50 -0700 -Subject: [PATCH] cmake: only enable C (not C++) - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3303f72..cd81f00 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ include(TestBigEndian) - include(CheckCSourceCompiles) - include(CheckSymbolExists) - include(cmake/macros.cmake) --project(libaec) -+project(libaec C) - set(libaec_VERSION_MAJOR 1) - set(libaec_VERSION_MINOR 0) - set(libaec_VERSION_PATCH 2) --- -2.14.3 - diff --git a/libaec.spec b/libaec.spec index a663add..e7cbefc 100644 --- a/libaec.spec +++ b/libaec.spec @@ -1,11 +1,10 @@ Name: libaec -Version: 1.0.2 -Release: 5%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Adaptive Entropy Coding library License: BSD Url: https://gitlab.dkrz.de/k202009/libaec -Source: https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-cmake-only-enable-C-not-C.patch +Source: https://gitlab.dkrz.de/k202009/libaec/-/archive/v%{version}/libaec-v%{version}.tar.gz BuildRequires: gcc BuildRequires: %{?fedora:cmake >= 3.1}%{?rhel:cmake3 >= 3.1} @@ -33,14 +32,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Devel files for libaec (Adaptive Entropy Coding library). %prep -%setup -q -T -a 0 -c -mv %{name}-v%{version}-*/* . -%patch0 -p1 +%setup -q -n %{name}-v%{version} %build mkdir build pushd build -%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. +%{cmake3} .. %make_build popd @@ -49,7 +46,7 @@ popd %check #test data missing in tarball for check_szcomp and sampledata.sh -make -C build test ARGS="-E \(check_szcomp\|sampledata.sh\)" +make -C build test CTEST_OUTPUT_ON_FAILURE=1 ARGS="-E \(check_szcomp\|sampledata.sh\)" %ldconfig_scriptlets @@ -65,6 +62,9 @@ make -C build test ARGS="-E \(check_szcomp\|sampledata.sh\)" %{_libdir}/lib*.so %changelog +* Mon Feb 04 2019 Christoph Junghans - 1.0.3-1 +- Version bump to 1.0.3 (bug #1672326) + * Fri Feb 01 2019 Fedora Release Engineering - 1.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 60bc833..53906cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libaec-1.0.2.tar.gz) = 28a8839089e4b643b259cb8679b96e602a35098d1129baae6b3923767060e5deabfa33256d628a8bcbf205368cda5f2e6701078de0caccf44e0597d932a67ba2 +SHA512 (libaec-v1.0.3.tar.gz) = 26c904fc6122772e809e1e6bf9d76e2b18eda6fff562aa5c82fdd9eb12c2a6381d42329c0e8957b3c68ed47999a6aee16cfdb4e0d904e3cb1d51b52f88ad4690