diff --git a/build-source-timestamp b/build-source-timestamp index 8d8764d..16eae55 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2767 +2769 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index bfc0a35..49eeb2c 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -26,7 +26,7 @@ BuildRequires: cups-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel -%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 BuildRequires: libuuid-devel %endif BuildRequires: pam-devel @@ -273,7 +273,7 @@ pushd source3 %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%{?rhel_version} > 599 || 0%{?suse_version} > 0 +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh %endif CONFIGURE_OPTIONS="\ @@ -448,7 +448,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index a0dd6d9..ce7c779 100644 --- a/samba.changes +++ b/samba.changes @@ -4,7 +4,7 @@ Mon Feb 27 15:57:07 UTC 2012 - lmuelle@suse.de - Make ldapsmb build with Fedora 15 and 16; (bso#8783). - BuildRequire libuuid-devel for post-11.0 and other systems. - Define missing python macros for non SUSE systems. -- PreReq of fillup_prereq and insserv_prereq on SUSE systems. +- PreReq to fillup_prereq and insserv_prereq only on SUSE systems. - Always use cifstab instead of smbfstab on non SUSE systems. ------------------------------------------------------------------- diff --git a/samba.spec b/samba.spec index d20af50..b9cb9a4 100644 --- a/samba.spec +++ b/samba.spec @@ -26,7 +26,7 @@ BuildRequires: cups-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel -%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 BuildRequires: libuuid-devel %endif BuildRequires: pam-devel @@ -217,7 +217,7 @@ Authors: The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package client @@ -263,7 +263,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -289,7 +289,7 @@ Authors: The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -319,7 +319,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -346,7 +346,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %if %{make_utils} @@ -367,7 +367,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -404,7 +404,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -430,14 +430,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libnetapi0 @@ -503,7 +503,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libnetapi-devel @@ -527,7 +527,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -548,14 +548,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -591,7 +591,7 @@ Authors: The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libwbclient0 @@ -609,7 +609,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libwbclient-devel @@ -633,7 +633,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtalloc2 @@ -653,7 +653,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtalloc-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtdb1 @@ -699,7 +699,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtdb-devel @@ -721,7 +721,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtevent0 @@ -741,7 +741,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libtevent-devel @@ -769,7 +769,7 @@ Authors: The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libldb1 @@ -791,7 +791,7 @@ Authors: The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %package -n libldb-devel @@ -818,7 +818,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %if %{make_ldapsmb} @@ -841,7 +841,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2767 +Source Timestamp: 2769 Branch : trunk %endif @@ -944,7 +944,7 @@ pushd source3 %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%{?rhel_version} > 599 || 0%{?suse_version} > 0 +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh %endif CONFIGURE_OPTIONS="\ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 7f1cac2..ebd9329 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:837618605c708d37d6bb53e7986734c01ff62a10122df40ca0f6fea91fa6a396 -size 52759 +oid sha256:f40c15c4dd6ce14b1041383d9d97b5df8b8baaafa59b5a232329a0e033c9e544 +size 52732