From b118cd25e58ef5a3d0504277fee801df696d5be3 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Thu, 13 Jun 2024 17:16:11 +0200 Subject: [PATCH] Remove incorrect Requires and Provides --- ...ib64-dirsrv-plugins-libback-bdb.so-h.patch | 40 +++++++++++++++++++ 389-ds-base.spec | 5 ++- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch diff --git a/0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch b/0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch new file mode 100644 index 0000000..e25b629 --- /dev/null +++ b/0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch @@ -0,0 +1,40 @@ +From cc556a853531190ff829b08e67c30bd986543f03 Mon Sep 17 00:00:00 2001 +From: Viktor Ashirov +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 + diff --git a/389-ds-base.spec b/389-ds-base.spec index 02a32a9..7dd66ea 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -7,6 +7,7 @@ ExcludeArch: i686 %if %{with bundle_jemalloc} %global jemalloc_name jemalloc %global jemalloc_ver 5.3.0 +%global __provides_exclude ^libjemalloc\\.so.*$ %endif %bcond bundle_libdb 1 @@ -455,8 +456,6 @@ Requires: cyrus-sasl-plain Requires: libdb %endif 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 %if %{without bundle_libdb} 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 %endif +Patch: 0001-Issue-6120-usr-lib64-dirsrv-plugins-libback-bdb.so-h.patch + %description 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration.