Skip to content

Commit 8dddcb7

Browse files
committed
rpmspec: Remove unwanted requires for external libldb
We always build with internal libldb. Thus we never used to depend on system installed/external libldb all this while. But somehow this special requires still existed. We haven't had a problem because libldb versions were much lower than samba versions until upstream decided to ship libldb with a matching samba version as a private or public library with 4.21. Now various libldb .so files from standard repositories(same version as samba) conflicts with the exact same content that we bundle during our build process. Therefore we remove this left over as we never depend on externally installed libldb in our samba builds. These were also removed from upstream packaging sources. ref: https://www.samba.org/samba/history/samba-4.21.0.html ref: https://src.fedoraproject.org/rpms/samba/c/d0472882 ref: https://src.fedoraproject.org/rpms/samba/pull-request/39
1 parent 83b38ef commit 8dddcb7

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

packaging/samba-4.20.spec.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
%bcond_with etcd_mutex
7272
%endif
7373

74-
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
75-
7674
%global baserelease 1
7775

7876
%global samba_version {{ samba_rpm_version }}
@@ -504,11 +502,6 @@ Requires: libwbclient = %{samba_depver}
504502
%endif
505503
Requires: ldb-tools
506504
Requires: python3-setproctitle
507-
# Force using libldb version to be the same as build version
508-
# Otherwise LDB modules will not be loaded and samba-tool will fail
509-
# See bug 1507420
510-
%samba_requires_eq libldb
511-
512505
Requires: python3-%{name} = %{samba_depver}
513506
Requires: python3-%{name}-dc = %{samba_depver}
514507
Requires: krb5-server >= %{required_mit_krb5}

packaging/samba-4.21.spec.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
%bcond_with etcd_mutex
7272
%endif
7373

74-
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
75-
7674
%global baserelease 1
7775

7876
%global samba_version {{ samba_rpm_version }}
@@ -502,11 +500,6 @@ Requires: libwbclient = %{samba_depver}
502500
%endif
503501
Requires: ldb-tools
504502
Requires: python3-setproctitle
505-
# Force using libldb version to be the same as build version
506-
# Otherwise LDB modules will not be loaded and samba-tool will fail
507-
# See bug 1507420
508-
%samba_requires_eq libldb
509-
510503
Requires: python3-%{name} = %{samba_depver}
511504
Requires: python3-%{name}-dc = %{samba_depver}
512505
Requires: krb5-server >= %{required_mit_krb5}

packaging/samba-master.spec.j2

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
%bcond_with etcd_mutex
7272
%endif
7373

74-
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
75-
7674
%global baserelease 1
7775

7876
%global samba_version {{ samba_rpm_version }}
@@ -502,11 +500,6 @@ Requires: libwbclient = %{samba_depver}
502500
%endif
503501
Requires: ldb-tools
504502
Requires: python3-setproctitle
505-
# Force using libldb version to be the same as build version
506-
# Otherwise LDB modules will not be loaded and samba-tool will fail
507-
# See bug 1507420
508-
%samba_requires_eq libldb
509-
510503
Requires: python3-%{name} = %{samba_depver}
511504
Requires: python3-%{name}-dc = %{samba_depver}
512505
Requires: krb5-server >= %{required_mit_krb5}

0 commit comments

Comments
 (0)