diff --git a/0001-Use-new-name-for-catch2-pkg-config-module.patch b/0001-Use-new-name-for-catch2-pkg-config-module.patch new file mode 100644 index 0000000..8bed88e --- /dev/null +++ b/0001-Use-new-name-for-catch2-pkg-config-module.patch @@ -0,0 +1,39 @@ +From 391feca3260299ad66428136704d375c7bd9e519 Mon Sep 17 00:00:00 2001 +From: Tom Hughes +Date: Mon, 23 Jul 2018 21:01:08 +0100 +Subject: [PATCH] Use new name for catch2 pkg-config module + +--- + test/CMakeLists.txt | 2 +- + test/test_cppcodec.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 22eb286..b8ec785 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -3,7 +3,7 @@ include_directories(BEFORE ${PROJECT_SOURCE_DIR}) + + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(CATCH2 catch) ++ pkg_check_modules(CATCH2 catch2) + endif() + + if (CATCH2_FOUND) +diff --git a/test/test_cppcodec.cpp b/test/test_cppcodec.cpp +index 5a3ed6c..156c16e 100644 +--- a/test/test_cppcodec.cpp ++++ b/test/test_cppcodec.cpp +@@ -22,7 +22,7 @@ + */ + + #define CATCH_CONFIG_MAIN +-#include ++#include + + #include + #include +-- +2.17.1 + diff --git a/cppcodec.spec b/cppcodec.spec index 701672a..ba24bc1 100644 --- a/cppcodec.spec +++ b/cppcodec.spec @@ -2,17 +2,18 @@ Name: cppcodec Version: 0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Header-only C++11 library to encode/decode base64/base64url/base32/base32hex/hex License: MIT URL: https://github.com/tplgy/cppcodec Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0001: 0001-Use-new-name-for-catch2-pkg-config-module.patch BuildRequires: cmake >= 2.8.5 BuildRequires: ninja-build BuildRequires: gcc-c++ -BuildRequires: pkgconfig(catch) +BuildRequires: pkgconfig(catch2) %global _description \ Header-only C++11 library to encode/decode base64, base64url, base32, base32hex\ @@ -30,7 +31,7 @@ Provides: %{name}-static = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{_description} %prep -%autosetup +%autosetup -p1 # No bundled catch rm -vrf test/catch @@ -53,6 +54,9 @@ rm -vrf test/catch %{_datadir}/pkgconfig/%{name}-1.pc %changelog +* Mon Jul 23 2018 Tom Hughes - 0.1-3 +- Patch for changes in catch2 pkg-config module name + * Thu Jul 12 2018 Fedora Release Engineering - 0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild