From 9b50e61a05549b405b607da734b8cfa0eeec7f403e706a46ed7b8f524e5d715b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 2 May 2012 14:36:13 +0000 Subject: [PATCH 1/9] Add PreReq /etc/init.d/nscd to the winbind package; (bnc#759731). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=236 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 ++++ samba.spec | 53 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 294441b..a5e6915 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2798 +2799 Branch : 3.6.5.PTF diff --git a/samba-doc.spec b/samba-doc.spec index 932b581..91b2352 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -451,7 +451,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %changelog diff --git a/samba.changes b/samba.changes index d03d391..c121757 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com + +- Add PreReq /etc/init.d/nscd to the winbind package; (bnc#759731). + ------------------------------------------------------------------- Sat Apr 21 20:59:53 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 96e0840..acb9955 100644 --- a/samba.spec +++ b/samba.spec @@ -211,7 +211,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package client @@ -252,7 +252,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -272,7 +272,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif @@ -297,7 +297,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif @@ -319,7 +319,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %if %{make_utils} @@ -335,7 +335,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif @@ -356,6 +356,7 @@ Recommends: cron Recommends: logrotate Recommends: samba-krb-printing %endif +PreReq: /etc/init.d/nscd %if 0%{?suse_version} > 0 PreReq: %{?insserv_prereq} %endif @@ -367,7 +368,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -393,14 +394,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %else %description -n libsmbclient0 -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif @@ -439,7 +440,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libnetapi0 @@ -452,7 +453,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libnetapi-devel @@ -471,7 +472,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -492,14 +493,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %else %description -n libsmbsharemodes0 -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif @@ -525,7 +526,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libwbclient0 @@ -538,7 +539,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libwbclient-devel @@ -557,7 +558,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtalloc2 @@ -572,7 +573,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtalloc-devel @@ -593,7 +594,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtdb1 @@ -608,7 +609,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtdb-devel @@ -625,7 +626,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtevent0 @@ -640,7 +641,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libtevent-devel @@ -662,7 +663,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libldb1 @@ -678,7 +679,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %package -n libldb-devel @@ -700,7 +701,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %if %{make_ldapsmb} @@ -718,7 +719,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2798 +Source Timestamp: 2799 Branch : 3.6.5.PTF %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index cdd7b36..be8ec92 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:94f5c263bc2a4d549a03c7cc638e785847d2a7877fc6370183de61881d6ca0a1 -size 52524 +oid sha256:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e +size 52523 From 5799e66cc10d6f9a8d41d6bf60cd5c832e7ec21e329b3cd6777bf6c94a443fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 14 May 2012 13:36:55 +0000 Subject: [PATCH 2/9] Remove accidently created package. The real name is libldb1. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=237 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 4 +- samba.changes | 5 ++ samba.spec | 145 ++++++++++++++++++++++++++--------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 105 insertions(+), 61 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index a5e6915..e1c0a0e 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2799 -Branch : 3.6.5.PTF +2799M +Branch : 3.6.5 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 62dc059..fe5ef17 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b -size 53552 +oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a +size 53537 diff --git a/samba-doc.spec b/samba-doc.spec index 91b2352..6e85d7e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -451,7 +451,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index c121757..90caebb 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 14 09:37:57 UTC 2012 - lmuelle@suse.com + +- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems. + ------------------------------------------------------------------- Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index acb9955..fa47785 100644 --- a/samba.spec +++ b/samba.spec @@ -211,8 +211,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package client License: GPL-3.0+ @@ -252,8 +252,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -272,8 +272,8 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -297,8 +297,8 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif @@ -319,8 +319,8 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %if %{make_utils} @@ -335,8 +335,8 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif @@ -368,8 +368,8 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -394,15 +394,15 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif This package includes the libsmbclient library. @@ -440,8 +440,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libnetapi0 License: GPL-3.0+ @@ -453,8 +453,8 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libnetapi-devel License: GPL-3.0+ @@ -472,8 +472,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -493,15 +493,15 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif This package includes the smbsharemodes library. @@ -526,8 +526,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libwbclient0 License: LGPL-3.0+ @@ -539,8 +539,8 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libwbclient-devel License: LGPL-3.0+ @@ -558,8 +558,10 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 %package -n libtalloc2 Version: %{libtalloc_ver} @@ -573,8 +575,8 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libtalloc-devel Version: %{libtalloc_ver} @@ -594,8 +596,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libtdb1 Version: %{libtdb_ver} @@ -609,8 +611,8 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libtdb-devel Version: %{libtdb_ver} @@ -626,8 +628,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libtevent0 Version: %{libtevent_ver} @@ -641,8 +643,8 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libtevent-devel Version: %{libtevent_ver} @@ -663,8 +665,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libldb1 Version: %{libldb_ver} @@ -679,8 +681,8 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %package -n libldb-devel Version: %{libldb_ver} @@ -700,9 +702,10 @@ 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: 2799M +Branch : 3.6.5 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +%endif %if %{make_ldapsmb} @@ -719,15 +722,15 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2799M +Branch : 3.6.5 %endif %prep %setup -n samba-%{samba_ver_full} -q # check if our library versions from the spec are still current -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ exit 1 grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ @@ -890,6 +893,8 @@ popd %endif popd +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + for lib_dir in tdb talloc; do pushd lib/${lib_dir} ./configure \ @@ -928,12 +933,16 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include make popd +%endif + %check +%if 0%{?suse_version} && 0%{?suse_version} < 1211 for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make test popd done +%endif pushd source3 make test_shlibs make test_nss_modules @@ -977,6 +986,9 @@ install -d -m 0755 -p \ %{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make install \ @@ -989,9 +1001,15 @@ make -C source4/lib/ldb/ install \ CONFIGDIR=%{CONFIGDIR} # we prefer the s3 binaries of the tdbtools rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} + +%endif + make -C source3/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + # libtalloc #rm %{buildroot}/%{_libdir}/*talloc* make -C lib/talloc/ install \ @@ -1004,6 +1022,9 @@ make -C lib/talloc/ install \ rm -r %{buildroot}/%{python_sitearch} \ %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ %{buildroot}/%{_libdir}/tevent + +%endif + for file in source3/pkgconfig/*.pc; do install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done @@ -1299,14 +1320,20 @@ fi %postun -n libnetapi0 -p /sbin/ldconfig +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %post -n libtalloc2 -p /sbin/ldconfig %postun -n libtalloc2 -p /sbin/ldconfig +%endif + %post -n libwbclient0 -p /sbin/ldconfig %postun -n libwbclient0 -p /sbin/ldconfig +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %post -n libtdb1 -p /sbin/ldconfig %postun -n libtdb1 -p /sbin/ldconfig @@ -1318,6 +1345,9 @@ fi %post -n libldb1 -p /sbin/ldconfig %postun -n libldb1 -p /sbin/ldconfig + +%endif + %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc @@ -1746,6 +1776,8 @@ fi %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbsharemodes.pc +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libpytalloc-util.so.* @@ -1776,6 +1808,8 @@ fi %{_libdir}/libtdb.so %{_libdir}/pkgconfig/tdb.pc +%endif + %files -n libwbclient0 %defattr(-,root,root) %{_libdir}/libwbclient.so.* @@ -1788,6 +1822,8 @@ fi %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %files -n libtevent0 %defattr(-,root,root) %{_libdir}/libtevent.so.* @@ -1813,6 +1849,9 @@ fi %{_libdir}/libpyldb-util.so %{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/pyldb-util.pc + +%endif + %if %{make_ldapsmb} %files -n ldapsmb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index be8ec92..3449129 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:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e -size 52523 +oid sha256:946e6efe5c37e29a29e4826e2d428896b2e42309695d7880d12c0d50cac37ff4 +size 52549 From 682bd9e57329f69e8c7d5cd5dad988abb73d48efc75b7563b5530f5275b15b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 14 May 2012 15:38:15 +0000 Subject: [PATCH 3/9] Revert to accidently overwritten state. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=238 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 4 +- samba.changes | 5 -- samba.spec | 145 +++++++++++++++-------------------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 61 insertions(+), 105 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index e1c0a0e..a5e6915 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2799M -Branch : 3.6.5 +2799 +Branch : 3.6.5.PTF diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fe5ef17..62dc059 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a -size 53537 +oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b +size 53552 diff --git a/samba-doc.spec b/samba-doc.spec index 6e85d7e..91b2352 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -451,7 +451,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %changelog diff --git a/samba.changes b/samba.changes index 90caebb..c121757 100644 --- a/samba.changes +++ b/samba.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon May 14 09:37:57 UTC 2012 - lmuelle@suse.com - -- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems. - ------------------------------------------------------------------- Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index fa47785..acb9955 100644 --- a/samba.spec +++ b/samba.spec @@ -211,8 +211,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package client License: GPL-3.0+ @@ -252,8 +252,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -272,8 +272,8 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -297,8 +297,8 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif @@ -319,8 +319,8 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %if %{make_utils} @@ -335,8 +335,8 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif @@ -368,8 +368,8 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -394,15 +394,15 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %else %description -n libsmbclient0 -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif This package includes the libsmbclient library. @@ -440,8 +440,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libnetapi0 License: GPL-3.0+ @@ -453,8 +453,8 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libnetapi-devel License: GPL-3.0+ @@ -472,8 +472,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -493,15 +493,15 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %else %description -n libsmbsharemodes0 -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif This package includes the smbsharemodes library. @@ -526,8 +526,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libwbclient0 License: LGPL-3.0+ @@ -539,8 +539,8 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libwbclient-devel License: LGPL-3.0+ @@ -558,10 +558,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 - -%if 0%{?suse_version} && 0%{?suse_version} < 1211 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtalloc2 Version: %{libtalloc_ver} @@ -575,8 +573,8 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtalloc-devel Version: %{libtalloc_ver} @@ -596,8 +594,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtdb1 Version: %{libtdb_ver} @@ -611,8 +609,8 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtdb-devel Version: %{libtdb_ver} @@ -628,8 +626,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtevent0 Version: %{libtevent_ver} @@ -643,8 +641,8 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libtevent-devel Version: %{libtevent_ver} @@ -665,8 +663,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libldb1 Version: %{libldb_ver} @@ -681,8 +679,8 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %package -n libldb-devel Version: %{libldb_ver} @@ -702,10 +700,9 @@ 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: 2799M -Branch : 3.6.5 -%endif +Source Timestamp: 2799 +Branch : 3.6.5.PTF %if %{make_ldapsmb} @@ -722,15 +719,15 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2799M -Branch : 3.6.5 +Source Timestamp: 2799 +Branch : 3.6.5.PTF %endif %prep %setup -n samba-%{samba_ver_full} -q # check if our library versions from the spec are still current -%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ exit 1 grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ @@ -893,8 +890,6 @@ popd %endif popd -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - for lib_dir in tdb talloc; do pushd lib/${lib_dir} ./configure \ @@ -933,16 +928,12 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include make popd -%endif - %check -%if 0%{?suse_version} && 0%{?suse_version} < 1211 for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make test popd done -%endif pushd source3 make test_shlibs make test_nss_modules @@ -986,9 +977,6 @@ install -d -m 0755 -p \ %{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System - -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make install \ @@ -1001,15 +989,9 @@ make -C source4/lib/ldb/ install \ CONFIGDIR=%{CONFIGDIR} # we prefer the s3 binaries of the tdbtools rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} - -%endif - make -C source3/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} - -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - # libtalloc #rm %{buildroot}/%{_libdir}/*talloc* make -C lib/talloc/ install \ @@ -1022,9 +1004,6 @@ make -C lib/talloc/ install \ rm -r %{buildroot}/%{python_sitearch} \ %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ %{buildroot}/%{_libdir}/tevent - -%endif - for file in source3/pkgconfig/*.pc; do install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done @@ -1320,20 +1299,14 @@ fi %postun -n libnetapi0 -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - %post -n libtalloc2 -p /sbin/ldconfig %postun -n libtalloc2 -p /sbin/ldconfig -%endif - %post -n libwbclient0 -p /sbin/ldconfig %postun -n libwbclient0 -p /sbin/ldconfig -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - %post -n libtdb1 -p /sbin/ldconfig %postun -n libtdb1 -p /sbin/ldconfig @@ -1345,9 +1318,6 @@ fi %post -n libldb1 -p /sbin/ldconfig %postun -n libldb1 -p /sbin/ldconfig - -%endif - %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc @@ -1776,8 +1746,6 @@ fi %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbsharemodes.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - %files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libpytalloc-util.so.* @@ -1808,8 +1776,6 @@ fi %{_libdir}/libtdb.so %{_libdir}/pkgconfig/tdb.pc -%endif - %files -n libwbclient0 %defattr(-,root,root) %{_libdir}/libwbclient.so.* @@ -1822,8 +1788,6 @@ fi %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc -%if 0%{?suse_version} && 0%{?suse_version} < 1211 - %files -n libtevent0 %defattr(-,root,root) %{_libdir}/libtevent.so.* @@ -1849,9 +1813,6 @@ fi %{_libdir}/libpyldb-util.so %{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/pyldb-util.pc - -%endif - %if %{make_ldapsmb} %files -n ldapsmb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3449129..be8ec92 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:946e6efe5c37e29a29e4826e2d428896b2e42309695d7880d12c0d50cac37ff4 -size 52549 +oid sha256:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e +size 52523 From 0a484ce829a87560057461b2f7247064dd300bbc6994538f4ae08c2384440c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 15 May 2012 10:58:22 +0000 Subject: [PATCH 4/9] - Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems. - BuildRequire libldb1-devel, libtalloc2-devel, libtdb1-devel, and libtevent0-devel on post-12.1 systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=239 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 14 +++- samba.changes | 7 ++ samba.spec | 155 +++++++++++++++++++++++++++-------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 125 insertions(+), 63 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index a5e6915..c922728 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2799 -Branch : 3.6.5.PTF +2801 +Branch : 3.6.5 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 62dc059..fe5ef17 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b -size 53552 +oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a +size 53537 diff --git a/samba-doc.spec b/samba-doc.spec index 91b2352..5f1f826 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -82,23 +82,31 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 +BuildRequires: libldb1-devel +BuildRequires: libtalloc2-devel +BuildRequires: libtdb1-devel +BuildRequires: libtevent0-devel +%endif %define samba_ver 3.6.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 %define libldb_ver 1.0.2 %define libtalloc_ver 2.0.5 %define libtdb_ver 1.2.9 %define libtevent_ver 0.9.11 %else +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 %define libldb_ver %{version} %define libtalloc_ver %{version} %define libtdb_ver %{version} %define libtevent_ver %{version} %endif +%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} %else @@ -451,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index c121757..eee6e60 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 15 11:54:41 UTC 2012 - lmuelle@suse.com + +- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems. +- BuildRequire libldb1-devel, libtalloc2-devel, libtdb1-devel, and + libtevent0-devel on post-12.1 systems. + ------------------------------------------------------------------- Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index acb9955..398f209 100644 --- a/samba.spec +++ b/samba.spec @@ -82,23 +82,31 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 +BuildRequires: libldb1-devel +BuildRequires: libtalloc2-devel +BuildRequires: libtdb1-devel +BuildRequires: libtevent0-devel +%endif %define samba_ver 3.6.5 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 %define libldb_ver 1.0.2 %define libtalloc_ver 2.0.5 %define libtdb_ver 1.2.9 %define libtevent_ver 0.9.11 %else +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 %define libldb_ver %{version} %define libtalloc_ver %{version} %define libtdb_ver %{version} %define libtevent_ver %{version} %endif +%endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} %else @@ -211,8 +219,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package client License: GPL-3.0+ @@ -252,8 +260,8 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -272,8 +280,8 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -297,8 +305,8 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif @@ -319,8 +327,8 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %if %{make_utils} @@ -335,8 +343,8 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif @@ -368,8 +376,8 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -394,15 +402,15 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif This package includes the libsmbclient library. @@ -440,8 +448,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libnetapi0 License: GPL-3.0+ @@ -453,8 +461,8 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libnetapi-devel License: GPL-3.0+ @@ -472,8 +480,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -493,15 +501,15 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif This package includes the smbsharemodes library. @@ -526,8 +534,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libwbclient0 License: LGPL-3.0+ @@ -539,8 +547,8 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libwbclient-devel License: LGPL-3.0+ @@ -558,8 +566,10 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 %package -n libtalloc2 Version: %{libtalloc_ver} @@ -573,8 +583,8 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libtalloc-devel Version: %{libtalloc_ver} @@ -594,8 +604,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libtdb1 Version: %{libtdb_ver} @@ -609,8 +619,8 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libtdb-devel Version: %{libtdb_ver} @@ -626,8 +636,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libtevent0 Version: %{libtevent_ver} @@ -641,8 +651,8 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libtevent-devel Version: %{libtevent_ver} @@ -663,8 +673,8 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libldb1 Version: %{libldb_ver} @@ -679,8 +689,8 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %package -n libldb-devel Version: %{libldb_ver} @@ -700,9 +710,10 @@ 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: 2801 +Branch : 3.6.5 -Source Timestamp: 2799 -Branch : 3.6.5.PTF +%endif %if %{make_ldapsmb} @@ -719,15 +730,15 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2799 -Branch : 3.6.5.PTF +Source Timestamp: 2801 +Branch : 3.6.5 %endif %prep %setup -n samba-%{samba_ver_full} -q # check if our library versions from the spec are still current -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211 grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ exit 1 grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ @@ -890,6 +901,8 @@ popd %endif popd +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + for lib_dir in tdb talloc; do pushd lib/${lib_dir} ./configure \ @@ -928,12 +941,16 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include make popd +%endif + %check +%if 0%{?suse_version} && 0%{?suse_version} < 1211 for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make test popd done +%endif pushd source3 make test_shlibs make test_nss_modules @@ -977,6 +994,9 @@ install -d -m 0755 -p \ %{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{_datadir}/susehelp/meta/Administration/System + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} make install \ @@ -989,9 +1009,15 @@ make -C source4/lib/ldb/ install \ CONFIGDIR=%{CONFIGDIR} # we prefer the s3 binaries of the tdbtools rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} + +%endif + make -C source3/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} + +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + # libtalloc #rm %{buildroot}/%{_libdir}/*talloc* make -C lib/talloc/ install \ @@ -1004,6 +1030,9 @@ make -C lib/talloc/ install \ rm -r %{buildroot}/%{python_sitearch} \ %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ %{buildroot}/%{_libdir}/tevent + +%endif + for file in source3/pkgconfig/*.pc; do install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done @@ -1299,14 +1328,20 @@ fi %postun -n libnetapi0 -p /sbin/ldconfig +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %post -n libtalloc2 -p /sbin/ldconfig %postun -n libtalloc2 -p /sbin/ldconfig +%endif + %post -n libwbclient0 -p /sbin/ldconfig %postun -n libwbclient0 -p /sbin/ldconfig +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %post -n libtdb1 -p /sbin/ldconfig %postun -n libtdb1 -p /sbin/ldconfig @@ -1318,6 +1353,9 @@ fi %post -n libldb1 -p /sbin/ldconfig %postun -n libldb1 -p /sbin/ldconfig + +%endif + %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc @@ -1746,6 +1784,8 @@ fi %{_libdir}/libsmbsharemodes.so %{_libdir}/pkgconfig/smbsharemodes.pc +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %files -n libtalloc2 %defattr(-,root,root) %{_libdir}/libpytalloc-util.so.* @@ -1776,6 +1816,8 @@ fi %{_libdir}/libtdb.so %{_libdir}/pkgconfig/tdb.pc +%endif + %files -n libwbclient0 %defattr(-,root,root) %{_libdir}/libwbclient.so.* @@ -1788,6 +1830,8 @@ fi %{_libdir}/libwbclient.so %{_libdir}/pkgconfig/wbclient.pc +%if 0%{?suse_version} && 0%{?suse_version} < 1211 + %files -n libtevent0 %defattr(-,root,root) %{_libdir}/libtevent.so.* @@ -1813,6 +1857,9 @@ fi %{_libdir}/libpyldb-util.so %{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/pyldb-util.pc + +%endif + %if %{make_ldapsmb} %files -n ldapsmb diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index be8ec92..1afec0e 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:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e -size 52523 +oid sha256:1bea4ed6c822816f0a065fc38b1cb7b376176719b76eeb51685d24d0048205e8 +size 52556 From 8fad521ca492f9d2c8d7e3e0c0c0521726746588fc6c498430d297d5f3557df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 30 May 2012 13:39:20 +0000 Subject: [PATCH 5/9] - s3: Fix a segfault with debug level 3 on Solaris; (bso#8861). - s3: wbinfo --lookup-sids "" crashes winbind; (bso#8904). - smbd crashes when deleting directory and veto files are enabled; (bso#8837). - winbind_krb5_locator only returns one IP address; (bso#8897). - Wrong assertion/comparison: Compare value not pointer; (bso#8859). - Inconsistent (with manpage) command-line switch for "help" in smbtree; (bso#8831). - Fix incorrect debug statement. - Setting traverse rights fails to enable directory traversal when acl_xattr in use; (bso#8857). - Syslog broken owing to mistyping of debug_settings.syslog; (bso#8877). - s3/ldap: remove outdated netscape ds 5 schema file; (bso#8869). - s3-docs: fixes several typos; (bso#7938). - s3-VFS: Fix building out-of-tree modules; (bso#8822). - s3-docs: Add hint that setting "profile acls = yes" on normal shares can cause trouble; (bso#7930). - s3-pam_winbind: Fix the build with a newer iniparser library; (bso#8915). - Avoid null dereference in initialize_password_db(); (bso#8920). - s3:registry: implement values_need_update and subkeys_need_update in the smbconf backend. - s3:registry:reg_api: fix reg_queryvalue to not fail when values are modified while it runs. - s4:torture:rpc:spoolss: also initialize driverName before checking it in test_PrinterData_DsSpooler(). - s3:registry: multiple cleanups, fixes, and optimisations. - s3:auth/server_info: the primary rid should be in the groups rid array; (bso#8798). - s3-printing: Add new printers to registry; (bso#8554); (baso#8612); (bso#8748). - Fix the overwriting of errno before use in a DEBUG statement and use the return value from store_acl_blob_fsp rather than ignoring it; (bso#8945). - s3-auth: Don't lookup the system user in pdb; (bso#8944). - s3-passdb: Fix negative SID->uid/gid cache handling; (bso#8952). - Fix typo in pam_winbindd code; (bso#8957). - Fix remove_duplicate_addrs2 previously it could leave zero addresses in the list; (bso#8910). - Slow but responsive DC can lock up winbindd; (bso#8943). - Broken processing of %U with vfs_full_audit when force user is set; (bso#8882). - s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845); (bnc#730769). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=240 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 46 ++++++++++++++++++++++++++++++++++++- samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 77 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index c922728..dfb5490 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2801 +2804 Branch : 3.6.5 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fe5ef17..1faf5b7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a -size 53537 +oid sha256:bd80125407bd75cf58fb25cab5f289448d10b4e1290bfe3620ef60c36432b760 +size 86261 diff --git a/samba-doc.spec b/samba-doc.spec index 5f1f826..25ba7ce 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -459,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index eee6e60..faefb12 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Wed May 30 12:07:39 UTC 2012 - lmuelle@suse.com + +- s3: Fix a segfault with debug level 3 on Solaris; (bso#8861). +- s3: wbinfo --lookup-sids "" crashes winbind; (bso#8904). +- smbd crashes when deleting directory and veto files are enabled; (bso#8837). +- winbind_krb5_locator only returns one IP address; (bso#8897). +- Wrong assertion/comparison: Compare value not pointer; (bso#8859). +- Inconsistent (with manpage) command-line switch for "help" in smbtree; + (bso#8831). +- Fix incorrect debug statement. +- Setting traverse rights fails to enable directory traversal when acl_xattr + in use; (bso#8857). +- Syslog broken owing to mistyping of debug_settings.syslog; (bso#8877). +- s3/ldap: remove outdated netscape ds 5 schema file; (bso#8869). +- s3-docs: fixes several typos; (bso#7938). +- s3-VFS: Fix building out-of-tree modules; (bso#8822). +- s3-docs: Add hint that setting "profile acls = yes" on normal shares can + cause trouble; (bso#7930). +- s3-pam_winbind: Fix the build with a newer iniparser library; (bso#8915). +- Avoid null dereference in initialize_password_db(); (bso#8920). +- s3:registry: implement values_need_update and subkeys_need_update in the + smbconf backend. +- s3:registry:reg_api: fix reg_queryvalue to not fail when values are + modified while it runs. +- s4:torture:rpc:spoolss: also initialize driverName before checking it in + test_PrinterData_DsSpooler(). +- s3:registry: multiple cleanups, fixes, and optimisations. +- s3:auth/server_info: the primary rid should be in the groups rid array; + (bso#8798). +- s3-printing: Add new printers to registry; (bso#8554); (baso#8612); + (bso#8748). +- Fix the overwriting of errno before use in a DEBUG statement and use the + return value from store_acl_blob_fsp rather than ignoring it; (bso#8945). +- s3-auth: Don't lookup the system user in pdb; (bso#8944). +- s3-passdb: Fix negative SID->uid/gid cache handling; (bso#8952). +- Fix typo in pam_winbindd code; (bso#8957). +- Fix remove_duplicate_addrs2 previously it could leave zero addresses in the + list; (bso#8910). +- Slow but responsive DC can lock up winbindd; (bso#8943). +- Broken processing of %U with vfs_full_audit when force user is set; + (bso#8882). + ------------------------------------------------------------------- Mon May 15 11:54:41 UTC 2012 - lmuelle@suse.com @@ -16,7 +59,8 @@ Sat Apr 21 20:59:53 UTC 2012 - lmuelle@suse.com - docs-xml: fix default name resolve order; (bso#7564). - s3-aio-fork: Fix a segfault in vfs_aio_fork; (bso#8836). - docs: remove whitespace in example samba.ldif; (bso#8789). -- s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845). +- s3-smbd: move print_backend_init() behind init_system_info(); (bso#8845); + (bnc#730769). - s3-docs: Prepend '/' to filename argument; (bso#8826). ------------------------------------------------------------------- diff --git a/samba.spec b/samba.spec index 398f209..ac90bd7 100644 --- a/samba.spec +++ b/samba.spec @@ -219,7 +219,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package client @@ -260,7 +260,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -280,7 +280,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -305,7 +305,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -327,7 +327,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %if %{make_utils} @@ -343,7 +343,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -376,7 +376,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -402,14 +402,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -448,7 +448,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libnetapi0 @@ -461,7 +461,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libnetapi-devel @@ -480,7 +480,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -501,14 +501,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -534,7 +534,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libwbclient0 @@ -547,7 +547,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libwbclient-devel @@ -566,7 +566,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -583,7 +583,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libtalloc-devel @@ -604,7 +604,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libtdb1 @@ -619,7 +619,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libtdb-devel @@ -636,7 +636,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libtevent0 @@ -651,7 +651,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libtevent-devel @@ -673,7 +673,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libldb1 @@ -689,7 +689,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %package -n libldb-devel @@ -710,7 +710,7 @@ 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: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif @@ -730,7 +730,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2801 +Source Timestamp: 2804 Branch : 3.6.5 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1afec0e..ae8dc5b 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:1bea4ed6c822816f0a065fc38b1cb7b376176719b76eeb51685d24d0048205e8 -size 52556 +oid sha256:8a14ff78f73a43c5312df4f8f76cf75a367af3d387a3cb568a25d9154489aa55 +size 52546 From ced19a58712b13adc026a9947f758918bbbd85148a71ad0d867f8b8891e334d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 31 May 2012 14:28:27 +0000 Subject: [PATCH 6/9] BuildRequire libldb-devel, libtalloc-devel, libtdb-devel, and libtevent-devel on post-12.1 systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=241 --- build-source-timestamp | 2 +- samba-doc.spec | 10 +++---- samba.changes | 6 +++++ samba.spec | 60 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index dfb5490..a9ac5fa 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2804 +2806 Branch : 3.6.5 diff --git a/samba-doc.spec b/samba-doc.spec index 25ba7ce..51de320 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -83,10 +83,10 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 -BuildRequires: libldb1-devel -BuildRequires: libtalloc2-devel -BuildRequires: libtdb1-devel -BuildRequires: libtevent0-devel +BuildRequires: libldb-devel +BuildRequires: libtalloc-devel +BuildRequires: libtdb-devel +BuildRequires: libtevent-devel %endif %define samba_ver 3.6.5 %define samba_ver_suffix %nil @@ -459,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index faefb12..6464998 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 31 14:07:36 UTC 2012 - lmuelle@suse.com + +- BuildRequire libldb-devel, libtalloc-devel, libtdb-devel, and + libtevent-devel on post-12.1 systems. + ------------------------------------------------------------------- Wed May 30 12:07:39 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index ac90bd7..efb229f 100644 --- a/samba.spec +++ b/samba.spec @@ -83,10 +83,10 @@ BuildRequires: pkg-config BuildRequires: pkgconfig %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210 -BuildRequires: libldb1-devel -BuildRequires: libtalloc2-devel -BuildRequires: libtdb1-devel -BuildRequires: libtevent0-devel +BuildRequires: libldb-devel +BuildRequires: libtalloc-devel +BuildRequires: libtdb-devel +BuildRequires: libtevent-devel %endif %define samba_ver 3.6.5 %define samba_ver_suffix %nil @@ -219,7 +219,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package client @@ -260,7 +260,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -280,7 +280,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -305,7 +305,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -327,7 +327,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %if %{make_utils} @@ -343,7 +343,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -376,7 +376,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -402,14 +402,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -448,7 +448,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libnetapi0 @@ -461,7 +461,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libnetapi-devel @@ -480,7 +480,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -501,14 +501,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -534,7 +534,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libwbclient0 @@ -547,7 +547,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libwbclient-devel @@ -566,7 +566,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -583,7 +583,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libtalloc-devel @@ -604,7 +604,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libtdb1 @@ -619,7 +619,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libtdb-devel @@ -636,7 +636,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libtevent0 @@ -651,7 +651,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libtevent-devel @@ -673,7 +673,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libldb1 @@ -689,7 +689,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %package -n libldb-devel @@ -710,7 +710,7 @@ 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: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif @@ -730,7 +730,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2804 +Source Timestamp: 2806 Branch : 3.6.5 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ae8dc5b..898d4b6 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:8a14ff78f73a43c5312df4f8f76cf75a367af3d387a3cb568a25d9154489aa55 -size 52546 +oid sha256:66f926c7fe8990cbce4b63920b64b2822fe532a2016e15523994a46eb5ce2c42 +size 52521 From 42b39e42bbdc31ee5a334e96ed546411ac5187649b1d3e948909b5c465aeea21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 31 May 2012 16:01:36 +0000 Subject: [PATCH 7/9] Install talloc.pc only on pre-12.2 and non SUSE systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=242 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 +++ samba.spec | 71 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 46 insertions(+), 38 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index a9ac5fa..e1a8881 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2806 +2807 Branch : 3.6.5 diff --git a/samba-doc.spec b/samba-doc.spec index 51de320..cda612f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -459,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index 6464998..76f97f7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 15:48:11 UTC 2012 - lmuelle@suse.com + +- Install talloc.pc only on pre-12.2 and non SUSE systems. + ------------------------------------------------------------------- Thu May 31 14:07:36 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index efb229f..a883c77 100644 --- a/samba.spec +++ b/samba.spec @@ -219,7 +219,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package client @@ -260,7 +260,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -280,7 +280,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -305,7 +305,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -327,7 +327,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if %{make_utils} @@ -343,7 +343,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -376,7 +376,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -402,14 +402,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -448,7 +448,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libnetapi0 @@ -461,7 +461,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libnetapi-devel @@ -480,7 +480,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -501,14 +501,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -534,7 +534,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libwbclient0 @@ -547,7 +547,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libwbclient-devel @@ -566,7 +566,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -583,7 +583,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtalloc-devel @@ -604,7 +604,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtdb1 @@ -619,7 +619,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtdb-devel @@ -636,7 +636,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtevent0 @@ -651,7 +651,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtevent-devel @@ -673,7 +673,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libldb1 @@ -689,7 +689,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libldb-devel @@ -710,7 +710,7 @@ 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: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -730,7 +730,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -1023,6 +1023,7 @@ make -C source3/ install \ make -C lib/talloc/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} +install -m 0644 source3/pkgconfig/talloc.pc %{buildroot}/%{_libdir}/pkgconfig # libtevent make -C lib/talloc/ install \ DESTDIR=%{buildroot} \ @@ -1033,7 +1034,7 @@ rm -r %{buildroot}/%{python_sitearch} \ %endif -for file in source3/pkgconfig/*.pc; do +for file in source3/pkgconfig/{netapi,smbclient,smbsharemodes,wbclient}.pc; do install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done # utility scripts @@ -1574,12 +1575,6 @@ fi %endif %{_bindir}/eventlogadm %{_bindir}/findsmb -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbrename -%{_bindir}/ldbsearch %{_bindir}/net %{_bindir}/nmblookup %{_bindir}/nmbstatus @@ -1598,11 +1593,19 @@ fi %{_bindir}/smbspool %{_bindir}/smbtar %{_bindir}/smbtree +%{_bindir}/testparm +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 +%{_bindir}/ldbadd +%{_bindir}/ldbdel +%{_bindir}/ldbedit +%{_bindir}/ldbmodify +%{_bindir}/ldbrename +%{_bindir}/ldbsearch %{_bindir}/tdbbackup %{_bindir}/tdbdump %{_bindir}/tdbrestore %{_bindir}/tdbtool -%{_bindir}/testparm +%endif %{_sbindir}/rc%{cifs_init_script} /%{_lib}/libnss_wins.so.2 %dir %{cups_lib_dir} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 898d4b6..986a2da 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:66f926c7fe8990cbce4b63920b64b2822fe532a2016e15523994a46eb5ce2c42 -size 52521 +oid sha256:2fc4215b628340689f2eddb1ee51760d0b11f8f02fc8ca3e9bc04ad256007fca +size 52529 From 60a9aaab13b9dcf6f19d23cdad9a9466f9f6c3a23b0befcbd07b4755f72e2c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 1 Jun 2012 14:25:36 +0000 Subject: [PATCH 8/9] 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 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 6 ++- samba.changes | 6 +++ samba.spec | 106 +++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 70 insertions(+), 60 deletions(-) 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 From 1718307db019a3716d3209073d785187a7e709d5f4a845df86ce0c6a4a6ae8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 1 Jun 2012 23:27:03 +0000 Subject: [PATCH 9/9] - Don't call autogen.sh on post-12.1 SUSE and post-14 Fedora systems. - Recompile all IDL in any case. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=244 --- build-source-timestamp | 2 +- samba-doc.spec | 6 ++--- samba.changes | 6 +++++ samba.spec | 56 ++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index f937a3b..7ae1362 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2808 +2809 Branch : 3.6.5.PTF diff --git a/samba-doc.spec b/samba-doc.spec index d13e127..8c3a63d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -287,11 +287,9 @@ pushd source3 %if 0%{?suse_version} && 0%{?suse_version} < 1141 %{?suse_update_config:%{suse_update_config -f}} %endif -#ln -s m4/aclocal.m4 aclocal.m4 -#autoreconf --force --install -I. -Im4 -I../lib/replace -%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 # Ensure all idl is recompiled, in case we are carrying pidl changes locally. rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 ./autogen.sh %endif CONFIGURE_OPTIONS="\ @@ -461,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %changelog diff --git a/samba.changes b/samba.changes index 77ea081..59f6e95 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 1 23:01:11 UTC 2012 - lmuelle@suse.com + +- Don't call autogen.sh on post-12.1 SUSE and post-14 Fedora systems. +- Recompile all IDL in any case. + ------------------------------------------------------------------- Fri Jun 1 14:18:58 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 81ef00b..b58711c 100644 --- a/samba.spec +++ b/samba.spec @@ -221,7 +221,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package client @@ -262,7 +262,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -282,7 +282,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -307,7 +307,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -329,7 +329,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %if %{make_utils} @@ -345,7 +345,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -378,7 +378,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -404,14 +404,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %else %description -n libsmbclient0 -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -450,7 +450,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libnetapi0 @@ -463,7 +463,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libnetapi-devel @@ -482,7 +482,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -503,14 +503,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %else %description -n libsmbsharemodes0 -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -536,7 +536,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libwbclient0 @@ -549,7 +549,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libwbclient-devel @@ -568,7 +568,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -585,7 +585,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libtalloc-devel @@ -606,7 +606,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libtdb1 @@ -621,7 +621,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libtdb-devel @@ -638,7 +638,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libtevent0 @@ -653,7 +653,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libtevent-devel @@ -675,7 +675,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libldb1 @@ -691,7 +691,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %package -n libldb-devel @@ -712,7 +712,7 @@ 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: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -732,7 +732,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2808 +Source Timestamp: 2809 Branch : 3.6.5.PTF %endif @@ -833,11 +833,9 @@ pushd source3 %if 0%{?suse_version} && 0%{?suse_version} < 1141 %{?suse_update_config:%{suse_update_config -f}} %endif -#ln -s m4/aclocal.m4 aclocal.m4 -#autoreconf --force --install -I. -Im4 -I../lib/replace -%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 # Ensure all idl is recompiled, in case we are carrying pidl changes locally. rm -f librpc/gen_ndr/*.[cho] ../librpc/gen_ndr/*.[cho] +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 && 0%{?fedora_version} < 15 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 ./autogen.sh %endif CONFIGURE_OPTIONS="\ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 060dc9c..8fd7131 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:d66a6ca57970c1653adef17d5da78c1fb8d134e0b369277722dc870769d8ee90 -size 52518 +oid sha256:e576b416ef26c24de6c601ed89928458973b5421671553dad684a0e8f85ba014 +size 52554