From 878eac0d9c25080c9cbb53b115b8520def8b26460bcb59c90ba442b30e181139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 5 Jun 2015 17:07:39 +0000 Subject: [PATCH] Remove build time requirement to dropped fam-devel on post-6 RHEL systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=467 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 4 +++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 92578b2..96c8d42 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71c10da7ffad414d7bff1098fac0cf650c403df08e7cd647e9a30143626d50ae -size 103388 +oid sha256:fe929ee131e2224a61bf49c1a2e9bab1f5abf9ffff1fe2564f645f9a2e71efff +size 103230 diff --git a/samba.changes b/samba.changes index 1245664..3bae717 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 16:12:47 UTC 2015 - lmuelle@suse.com + +- Remove build time requirement to dropped fam-devel on post-6 RHEL systems. + ------------------------------------------------------------------- Fri May 29 12:23:07 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 44e67e3..0492cd7 100644 --- a/samba.spec +++ b/samba.spec @@ -34,8 +34,10 @@ BuildRequires: libarchive-devel %if 0%{?suse_version} > 1210 BuildRequires: gamin-devel %else +%if 0%{?rhel_version} < 700 BuildRequires: fam-devel %endif +%endif BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -143,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3408 +%define SOURCE_TIMESTAMP 3410 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 53a51ca..9eb26ac 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:a5c5bf9f839d65a55317a7e42525c8eb109ca0cf6422526b56945d011c510d00 -size 52914 +oid sha256:71099b0fcdd271a92a9428e40892342a4775d84650184ef3555bbfbaa90b4c8f +size 52780