diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9228905..fe41ed7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53454860e67efc747c8830540796aa69708cb945d9c4b6ccb6d1dd315b2eef2e -size 282760 +oid sha256:c1d0c7cee3e981183cef364b760158672cc39d4579291b5d57eb158a5ec523cd +size 282735 diff --git a/samba.changes b/samba.changes index 436592e..dde8e77 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 12 17:15:09 UTC 2014 - lmuelle@suse.com + +- BuildRequire libxslt and perl-ExtUtils-MakeMaker and BuildIgnore libtevent + on CentOS, Fedora, and RHEL systems. + ------------------------------------------------------------------- Tue Jun 3 18:36:06 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 857c0e5..5e59ff3 100644 --- a/samba.spec +++ b/samba.spec @@ -41,6 +41,9 @@ BuildRequires: libattr-devel BuildRequires: libuuid-devel %endif BuildRequires: pam-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 +BuildRequires: perl-ExtUtils-MakeMaker +%endif BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} @@ -99,11 +102,12 @@ BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel BuildRequires: python-tdb +#!BuildIgnore: libtevent BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 || 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 BuildRequires: libxslt %endif %if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 @@ -144,7 +148,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3250 +%define SOURCE_TIMESTAMP 3252 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5700fb4..e3572a9 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:6b97895523051421074df5de662b67a75570945b931b2c7c54b25182d85cb716 -size 54821 +oid sha256:e24d1e6f19e73b3c6ec81e5dd8de0ab9ce0c40f232c677f6dd1d951a8d3ecefb +size 54880