Remove incorrect Requires and Provides

This commit is contained in:
Viktor Ashirov 2024-06-13 17:16:11 +02:00
parent 100164c750
commit b118cd25e5
2 changed files with 43 additions and 2 deletions

View File

@ -0,0 +1,40 @@
From cc556a853531190ff829b08e67c30bd986543f03 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: Mon, 10 Jun 2024 09:43:38 +0200
Subject: [PATCH] Issue 6120 - /usr/lib64/dirsrv/plugins/libback-bdb.so has an
invalid-looking DT_RPATH: /usr/lib/dirsrv
Bug Description:
rpminspect reports an invalid DT_RPATH /usr/lib/dirsrv
It's evaluated in m4/bundle_libdb.m4 from
```
-R${prefix}/lib/dirsrv"
```
Fix Description:
Change it to lib64
Fixes: https://github.com/389ds/389-ds-base/issues/6210
Reviewed by: @progier389 (Thanks!)
---
m4/bundle_libdb.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/bundle_libdb.m4 b/m4/bundle_libdb.m4
index c9bf3142e..3ae3beb49 100644
--- a/m4/bundle_libdb.m4
+++ b/m4/bundle_libdb.m4
@@ -8,7 +8,7 @@
AC_MSG_CHECKING(Handling bundle_libdb)
-db_lib="-L${with_bundle_libdb}/.libs -R${prefix}/lib/dirsrv"
+db_lib="-L${with_bundle_libdb}/.libs -R${prefix}/lib64/dirsrv"
db_incdir=$with_bundle_libdb
db_inc="-I $db_incdir"
db_libver="5.3-389ds"
--
2.45.0

View File

@ -7,6 +7,7 @@ ExcludeArch: i686
%if %{with bundle_jemalloc} %if %{with bundle_jemalloc}
%global jemalloc_name jemalloc %global jemalloc_name jemalloc
%global jemalloc_ver 5.3.0 %global jemalloc_ver 5.3.0
%global __provides_exclude ^libjemalloc\\.so.*$
%endif %endif
%bcond bundle_libdb 1 %bcond bundle_libdb 1
@ -455,8 +456,6 @@ Requires: cyrus-sasl-plain
Requires: libdb Requires: libdb
%endif %endif
Requires: lmdb Requires: lmdb
# This picks up libperl.so as a Requires, so we add this versioned one
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# Needed by logconv.pl # Needed by logconv.pl
%if %{without bundle_libdb} %if %{without bundle_libdb}
Requires: perl-DB_File Requires: perl-DB_File
@ -486,6 +485,8 @@ Source4: 389-ds-base.sysusers
Source5: https://fedorapeople.org/groups/389ds/libdb-5.3.28-59.tar.bz2 Source5: https://fedorapeople.org/groups/389ds/libdb-5.3.28-59.tar.bz2
%endif %endif
Patch: 0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch
%description %description
389 Directory Server is an LDAPv3 compliant server. The base package includes 389 Directory Server is an LDAPv3 compliant server. The base package includes
the LDAP server and command line utilities for server administration. the LDAP server and command line utilities for server administration.