backport upstream cmake-related fix
This commit is contained in:
parent
fd703b6abf
commit
5c52124875
33
0002-Remove-a-forgotten-instance-of-libsuffix.patch
Normal file
33
0002-Remove-a-forgotten-instance-of-libsuffix.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Heiko Becker <heirecka@exherbo.org>
|
||||||
|
Date: Wed, 16 Nov 2016 23:09:45 +0100
|
||||||
|
Subject: [PATCH 02/17] Remove a forgotten instance of @libsuffix@
|
||||||
|
|
||||||
|
* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
|
||||||
|
instance of @libsuffix@.
|
||||||
|
--
|
||||||
|
|
||||||
|
b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
|
||||||
|
cmake config files, but missed one instance.
|
||||||
|
|
||||||
|
Signed-off-by: Heiko Becker <heirecka@exherbo.org>
|
||||||
|
---
|
||||||
|
lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
|
||||||
|
index 928d19f..cbe9713 100644
|
||||||
|
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
|
||||||
|
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
|
||||||
|
@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
|
||||||
|
|
||||||
|
set_target_properties(Gpgmepp PROPERTIES
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
|
||||||
|
- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
|
||||||
|
+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
|
||||||
|
IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
|
||||||
|
)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
@ -11,7 +11,7 @@
|
|||||||
Name: gpgme
|
Name: gpgme
|
||||||
Summary: GnuPG Made Easy - high level crypto API
|
Summary: GnuPG Made Easy - high level crypto API
|
||||||
Version: 1.8.0
|
Version: 1.8.0
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://gnupg.org/related_software/gpgme/
|
URL: https://gnupg.org/related_software/gpgme/
|
||||||
@ -22,6 +22,8 @@ Source2: gpgme-multilib.h
|
|||||||
Patch0: gpgme-1.7.0-confix_extras.patch
|
Patch0: gpgme-1.7.0-confix_extras.patch
|
||||||
# add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
|
# add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
|
||||||
Patch1: gpgme-1.3.2-largefile.patch
|
Patch1: gpgme-1.3.2-largefile.patch
|
||||||
|
# upstream fix for cmake file(s)
|
||||||
|
Patch2: 0002-Remove-a-forgotten-instance-of-libsuffix.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -223,6 +225,9 @@ fi
|
|||||||
%{python3_sitearch}/gpg/
|
%{python3_sitearch}/gpg/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 1.8.0-6
|
||||||
|
- backport upstream cmake-related fix
|
||||||
|
|
||||||
* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-5
|
* Thu Dec 22 2016 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-5
|
||||||
- Rebuild for Python 3.6
|
- Rebuild for Python 3.6
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user