Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Anderson Toshiyuki Sasaki
ea9aa9c834 Fix invalid library path in cmake configuration
Resolves: #1809275
2020-03-03 13:58:34 +01:00
Andreas Schneider
e96dbd0243 Fix invalid lib pkg-config lib path
resolves: #1801869
2020-02-14 17:27:30 +01:00
3 changed files with 39 additions and 1 deletions

View file

@ -0,0 +1,23 @@
From 7b3211858d07cb93f89c1fd5eaa178f14e1f1968 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 12 Feb 2020 09:52:40 +0100
Subject: [PATCH] pkg-config: Fix installation path
Signed-off-by: Andreas Schneider <asn@samba.org>
---
uid_wrapper.pc.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uid_wrapper.pc.cmake b/uid_wrapper.pc.cmake
index c15d3be..7e0095c 100644
--- a/uid_wrapper.pc.cmake
+++ b/uid_wrapper.pc.cmake
@@ -1,4 +1,4 @@
Name: @PROJECT_NAME@
Description: The uid_wrapper library
Version: @PROJECT_VERSION@
-Libs: @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@
+Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@
--
2.24.1

View file

@ -0,0 +1,6 @@
index 0a3e3fd..43ab1fa 100644
--- a/uid_wrapper-config.cmake.in
+++ b/uid_wrapper-config.cmake.in
@@ -1 +1 @@
-set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_LIBDIR@/@UID_WRAPPER_LIB@)
+set(UID_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@UID_WRAPPER_LIB@)

View file

@ -1,6 +1,6 @@
Name: uid_wrapper
Version: 1.2.7
Release: 1%{?dist}
Release: 3%{?dist}
Summary: A wrapper for privilege separation
License: GPLv3+
@ -10,6 +10,9 @@ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
Source2: uid_wrapper.keyring
Patch0: 0001-pkg-config-Fix-installation-path.patch
Patch1: uid_wrapper-1.2.7-cmake-config-fix-installation-path.patch
BuildRequires: gcc
BuildRequires: cmake
BuildRequires: gnupg2
@ -73,6 +76,12 @@ popd
%{_mandir}/man1/uid_wrapper.1*
%changelog
* Tue Mar 03 2020 Anderson Sasaki <ansasaki@redhat.com> - 1.2.7-3
- Fix invalid library path in cmake configuration file (bz#1809275)
* Wed Feb 12 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-2
- resolves: #1801869 - Fix invalid lib pkg-config lib path
* Tue Feb 11 2020 Andreas Schneider <asn@redhat.com> - 1.2.7-1
- Update to version 1.2.7
* Fix unsetting initial XIDs