BuildIgnore libtalloc and libtdb to prevent a package conflict on Fedora

systems.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=243
This commit is contained in:
Lars Müller 2012-06-01 14:25:36 +00:00 committed by Git OBS Bridge
parent 42b39e42bb
commit 60a9aaab13
6 changed files with 70 additions and 60 deletions

View File

@ -1,2 +1,2 @@
2807 2808
Branch : 3.6.5 Branch : 3.6.5.PTF

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:bd80125407bd75cf58fb25cab5f289448d10b4e1290bfe3620ef60c36432b760 oid sha256:3a734a1d3293ad44db285d112d883411d0319b690ae12d339304be90c952d977
size 86261 size 86289

View File

@ -84,7 +84,9 @@ BuildRequires: pkgconfig
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb-devel BuildRequires: libldb-devel
#!BuildIgnore: libtalloc
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
#!BuildIgnore: libtdb
BuildRequires: libtdb-devel BuildRequires: libtdb-devel
BuildRequires: libtevent-devel BuildRequires: libtevent-devel
%endif %endif
@ -459,7 +461,7 @@ This package contains all the Samba documentation as it is not part of
the man pages. the man pages.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%changelog %changelog

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 1 14:18:58 UTC 2012 - lmuelle@suse.com
- BuildIgnore libtalloc and libtdb to prevent a package conflict on Fedora
systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 31 15:48:11 UTC 2012 - lmuelle@suse.com Thu May 31 15:48:11 UTC 2012 - lmuelle@suse.com

View File

@ -84,7 +84,9 @@ BuildRequires: pkgconfig
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb-devel BuildRequires: libldb-devel
#!BuildIgnore: libtalloc
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
#!BuildIgnore: libtdb
BuildRequires: libtdb-devel BuildRequires: libtdb-devel
BuildRequires: libtevent-devel BuildRequires: libtevent-devel
%endif %endif
@ -219,8 +221,8 @@ binary packages of the most current Samba version, and a bug reporting
how to. how to.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package client %package client
License: GPL-3.0+ License: GPL-3.0+
@ -260,8 +262,8 @@ binary packages of the most current Samba version, and a bug reporting
how to. how to.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -280,8 +282,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of Samba. develop programs which make use of Samba.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@ -305,8 +307,8 @@ This package contains all the Samba documentation as it is not part of
the man pages. the man pages.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
@ -327,8 +329,8 @@ Requires: samba-client >= %{version}
A wrapper binary to run smbspool with the original calling UID. A wrapper binary to run smbspool with the original calling UID.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%if %{make_utils} %if %{make_utils}
@ -343,8 +345,8 @@ Obsoletes: samba-gplv3-utils < %{version}
Some of the debug-tools for developpers. Some of the debug-tools for developpers.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
@ -376,8 +378,8 @@ PreReq: coreutils
This is the winbind-daemon and the wbinfo-tool. This is the winbind-daemon and the wbinfo-tool.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -402,15 +404,15 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%else %else
%description -n libsmbclient0 %description -n libsmbclient0
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
This package includes the libsmbclient library. This package includes the libsmbclient library.
@ -448,8 +450,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the smbclient programming interface. develop programs which make use of the smbclient programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libnetapi0 %package -n libnetapi0
License: GPL-3.0+ License: GPL-3.0+
@ -461,8 +463,8 @@ PreReq: /sbin/ldconfig
This package includes the netapi library. This package includes the netapi library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libnetapi-devel %package -n libnetapi-devel
License: GPL-3.0+ License: GPL-3.0+
@ -480,8 +482,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the netapi programming interface. develop programs which make use of the netapi programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -501,15 +503,15 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%else %else
%description -n libsmbsharemodes0 %description -n libsmbsharemodes0
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
This package includes the smbsharemodes library. This package includes the smbsharemodes library.
@ -534,8 +536,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the smbsharemodes programming interface. develop programs which make use of the smbsharemodes programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libwbclient0 %package -n libwbclient0
License: LGPL-3.0+ License: LGPL-3.0+
@ -547,8 +549,8 @@ PreReq: /sbin/ldconfig
This package includes the wbclient library. This package includes the wbclient library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libwbclient-devel %package -n libwbclient-devel
License: LGPL-3.0+ License: LGPL-3.0+
@ -566,8 +568,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the wbclient programming interface. develop programs which make use of the wbclient programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%if 0%{?suse_version} && 0%{?suse_version} < 1211 %if 0%{?suse_version} && 0%{?suse_version} < 1211
@ -583,8 +585,8 @@ PreReq: /sbin/ldconfig
This package includes the talloc library. This package includes the talloc library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libtalloc-devel %package -n libtalloc-devel
Version: %{libtalloc_ver} Version: %{libtalloc_ver}
@ -604,8 +606,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the talloc programming interface. develop programs which make use of the talloc programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libtdb1 %package -n libtdb1
Version: %{libtdb_ver} Version: %{libtdb_ver}
@ -619,8 +621,8 @@ PreReq: /sbin/ldconfig
This package includes the tdb library. This package includes the tdb library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libtdb-devel %package -n libtdb-devel
Version: %{libtdb_ver} Version: %{libtdb_ver}
@ -636,8 +638,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the tdb programming interface. develop programs which make use of the tdb programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libtevent0 %package -n libtevent0
Version: %{libtevent_ver} Version: %{libtevent_ver}
@ -651,8 +653,8 @@ PreReq: /sbin/ldconfig
This package includes the tevent library. This package includes the tevent library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libtevent-devel %package -n libtevent-devel
Version: %{libtevent_ver} Version: %{libtevent_ver}
@ -673,8 +675,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the tevent programming interface. develop programs which make use of the tevent programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libldb1 %package -n libldb1
Version: %{libldb_ver} Version: %{libldb_ver}
@ -689,8 +691,8 @@ PreReq: /sbin/ldconfig
This package includes the ldb library. This package includes the ldb library.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%package -n libldb-devel %package -n libldb-devel
Version: %{libldb_ver} Version: %{libldb_ver}
@ -710,8 +712,8 @@ Requires: libtalloc-devel
This package contains the static libraries and header files needed to This package contains the static libraries and header files needed to
develop programs which make use of the tevent programming interface. develop programs which make use of the tevent programming interface.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif
@ -730,8 +732,8 @@ This tool aims to simplify the administration of a Samba Domain
Controller that uses the ldapsam passdb backend. Controller that uses the ldapsam passdb backend.
Source Timestamp: 2807 Source Timestamp: 2808
Branch : 3.6.5 Branch : 3.6.5.PTF
%endif %endif

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2fc4215b628340689f2eddb1ee51760d0b11f8f02fc8ca3e9bc04ad256007fca oid sha256:d66a6ca57970c1653adef17d5da78c1fb8d134e0b369277722dc870769d8ee90
size 52529 size 52518