libcmark.pc patch seems to make lib64 patch redundant

epel9
Jens Petersen 8 years ago
parent 57ac0eba94
commit 83bd1650ae

@ -1,25 +0,0 @@
From bb2ea3ee4fd9b99b79159598c9a0f8024518c600 Mon Sep 17 00:00:00 2001
From: John Dulaney <jdulaney@fedoraproject.org>
Date: Fri, 29 Apr 2016 14:48:09 -0400
Subject: [PATCH] Add include for GNUInstallDirs
Signed-off-by: John Dulaney <jdulaney@fedoraproject.org>
---
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

@ -6,13 +6,12 @@
Name: cmark Name: cmark
Version: 0.25.2 Version: 0.25.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: CommonMark parsing and rendering Summary: CommonMark parsing and rendering
License: BSD and MIT License: BSD and MIT
URL: https://github.com/jgm/cmark URL: https://github.com/jgm/cmark
Source0: https://github.com/jgm/cmark/archive/%{version}.tar.gz Source0: https://github.com/jgm/cmark/archive/%{version}.tar.gz
Patch1: cmark-lib64.patch
Patch2: cmark-0.25.2-libcmark.pc-libdir.patch Patch2: cmark-0.25.2-libcmark.pc-libdir.patch
BuildRequires: cmake BuildRequires: cmake
@ -49,7 +48,6 @@ This package provides the cmark library.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig %patch2 -p1 -b .orig
@ -102,6 +100,9 @@ make test
%changelog %changelog
* Tue Feb 7 2017 Jens Petersen <petersen@redhat.com> - 0.25.2-3
- drop lib64 patch
* Sun Feb 5 2017 Jens Petersen <petersen@redhat.com> - 0.25.2-2 * Sun Feb 5 2017 Jens Petersen <petersen@redhat.com> - 0.25.2-2
- fix libdir in libcmark.pc for pkgconf (#1416426) - fix libdir in libcmark.pc for pkgconf (#1416426)
- use bcond for tests - use bcond for tests

Loading…
Cancel
Save