From 83bd1650ae5deaf34b155c102bba4f68857ca31f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Feb 2017 17:35:52 +0900 Subject: [PATCH] libcmark.pc patch seems to make lib64 patch redundant --- cmark-lib64.patch | 25 ------------------------- cmark.spec | 7 ++++--- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 cmark-lib64.patch diff --git a/cmark-lib64.patch b/cmark-lib64.patch deleted file mode 100644 index a2e0185..0000000 --- a/cmark-lib64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bb2ea3ee4fd9b99b79159598c9a0f8024518c600 Mon Sep 17 00:00:00 2001 -From: John Dulaney -Date: Fri, 29 Apr 2016 14:48:09 -0400 -Subject: [PATCH] Add include for GNUInstallDirs - -Signed-off-by: John Dulaney ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ab6a72..82f761f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,7 @@ - cmake_minimum_required(VERSION 2.8.9) - project(cmark) - include("FindAsan.cmake") -+include(GNUInstallDirs) - - if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - message(FATAL_ERROR "Do not build in-source.\nPlease remove CMakeCache.txt and the CMakeFiles/ directory.\nThen: mkdir build ; cd build ; cmake .. ; make") --- -2.7.4 - diff --git a/cmark.spec b/cmark.spec index 39fd9dd..4d10c55 100644 --- a/cmark.spec +++ b/cmark.spec @@ -6,13 +6,12 @@ Name: cmark Version: 0.25.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CommonMark parsing and rendering License: BSD and MIT URL: https://github.com/jgm/cmark Source0: https://github.com/jgm/cmark/archive/%{version}.tar.gz -Patch1: cmark-lib64.patch Patch2: cmark-0.25.2-libcmark.pc-libdir.patch BuildRequires: cmake @@ -49,7 +48,6 @@ This package provides the cmark library. %prep %setup -q -%patch1 -p1 -b .orig %patch2 -p1 -b .orig @@ -102,6 +100,9 @@ make test %changelog +* Tue Feb 7 2017 Jens Petersen - 0.25.2-3 +- drop lib64 patch + * Sun Feb 5 2017 Jens Petersen - 0.25.2-2 - fix libdir in libcmark.pc for pkgconf (#1416426) - use bcond for tests