diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fe41ed7..79bc862 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1d0c7cee3e981183cef364b760158672cc39d4579291b5d57eb158a5ec523cd -size 282735 +oid sha256:d25328e8460eca493aad9cad75fa033158486a5d070807f26d670cae260232dc +size 282593 diff --git a/samba.changes b/samba.changes index dde8e77..bfce611 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 12 18:09:44 UTC 2014 - lmuelle@suse.com + +- BuildRequire krb5-devel, libiniparser-devel, and python-devel in any case. + ------------------------------------------------------------------- Thu Jun 12 17:15:09 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 5e59ff3..fca14ea 100644 --- a/samba.spec +++ b/samba.spec @@ -35,8 +35,10 @@ BuildRequires: gamin-devel %else BuildRequires: fam-devel %endif +BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel +BuildRequires: libiniparser-devel %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 @@ -45,6 +47,7 @@ BuildRequires: pam-devel BuildRequires: perl-ExtUtils-MakeMaker %endif BuildRequires: popt-devel +BuildRequires: python-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel @@ -56,10 +59,7 @@ BuildRequires: gdbm-devel BuildRequires: pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel -BuildRequires: libiniparser-devel BuildRequires: libnscd-devel -BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 BuildRequires: dmapi-devel @@ -72,9 +72,7 @@ BuildRequires: xfsprogs-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel BuildRequires: openldap-devel -BuildRequires: python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -107,7 +105,7 @@ BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 || 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 BuildRequires: libxslt %endif %if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 @@ -148,7 +146,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3252 +%define SOURCE_TIMESTAMP 3254 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e3572a9..239dd54 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:e24d1e6f19e73b3c6ec81e5dd8de0ab9ce0c40f232c677f6dd1d951a8d3ecefb -size 54880 +oid sha256:e5251bd67074899b948c1216815286e77b9717fda3e1406ad083ad59d37e3eac +size 54874