diff --git a/build-source-timestamp b/build-source-timestamp index e1a8881..f937a3b 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2807 -Branch : 3.6.5 +2808 +Branch : 3.6.5.PTF diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 1faf5b7..ce80ca8 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd80125407bd75cf58fb25cab5f289448d10b4e1290bfe3620ef60c36432b760 -size 86261 +oid sha256:3a734a1d3293ad44db285d112d883411d0319b690ae12d339304be90c952d977 +size 86289 diff --git a/samba-doc.spec b/samba-doc.spec index cda612f..d13e127 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -84,7 +84,9 @@ BuildRequires: pkgconfig %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel +#!BuildIgnore: libtalloc BuildRequires: libtalloc-devel +#!BuildIgnore: libtdb BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif @@ -459,7 +461,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %changelog diff --git a/samba.changes b/samba.changes index 76f97f7..77ea081 100644 --- a/samba.changes +++ b/samba.changes @@ -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 diff --git a/samba.spec b/samba.spec index a883c77..81ef00b 100644 --- a/samba.spec +++ b/samba.spec @@ -84,7 +84,9 @@ BuildRequires: pkgconfig %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 BuildRequires: libldb-devel +#!BuildIgnore: libtalloc BuildRequires: libtalloc-devel +#!BuildIgnore: libtdb BuildRequires: libtdb-devel BuildRequires: libtevent-devel %endif @@ -219,8 +221,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package client License: GPL-3.0+ @@ -260,8 +262,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif %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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif @@ -327,8 +329,8 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %if %{make_utils} @@ -343,8 +345,8 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif @@ -376,8 +378,8 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -402,15 +404,15 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %else %description -n libsmbclient0 -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libnetapi0 License: GPL-3.0+ @@ -461,8 +463,8 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libnetapi-devel 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -501,15 +503,15 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %else %description -n libsmbsharemodes0 -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libwbclient0 License: LGPL-3.0+ @@ -547,8 +549,8 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libwbclient-devel 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -583,8 +585,8 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libtalloc-devel 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libtdb1 Version: %{libtdb_ver} @@ -619,8 +621,8 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libtdb-devel 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libtevent0 Version: %{libtevent_ver} @@ -651,8 +653,8 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libtevent-devel 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. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libldb1 Version: %{libldb_ver} @@ -689,8 +691,8 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %package -n libldb-devel Version: %{libldb_ver} @@ -710,8 +712,8 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif @@ -730,8 +732,8 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2807 -Branch : 3.6.5 +Source Timestamp: 2808 +Branch : 3.6.5.PTF %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 986a2da..060dc9c 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fc4215b628340689f2eddb1ee51760d0b11f8f02fc8ca3e9bc04ad256007fca -size 52529 +oid sha256:d66a6ca57970c1653adef17d5da78c1fb8d134e0b369277722dc870769d8ee90 +size 52518