diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9f4aef8..2fa4a48 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc185fcdcde51f3760a278eaf41d5ba9590bd27ec898b1418fb343ef2cefbc3a -size 86527 +oid sha256:ef3045a3132107d9e3d31b2d07bb7c1e351cea1462cd5f8aa36a4fb8d75cc6c6 +size 86429 diff --git a/samba.changes b/samba.changes index a7f50ab..ce6e76b 100644 --- a/samba.changes +++ b/samba.changes @@ -4,6 +4,12 @@ Wed Jan 8 15:36:42 UTC 2014 - lmuelle@suse.com - Call stop_on_removal from preun and restart_on_update and insserv_cleanup from postun on pre-12.3 systems only; (bnc#856759). +------------------------------------------------------------------- +Wed Jan 8 13:53:33 UTC 2014 - adrian@suse.de + +- BuildRequire gamin-devel instead of unmaintained fam-devel package on + post-12.1 systems. + ------------------------------------------------------------------- Mon Jan 6 21:37:37 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index eac8fdb..cf30e5b 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # # spec file for package samba # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,11 @@ BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +%if 0%{?suse_version} > 1210 +BuildRequires: gamin-devel +%else BuildRequires: fam-devel +%endif BuildRequires: libacl-devel BuildRequires: libattr-devel %if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 @@ -135,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3140 +%define SOURCE_TIMESTAMP 3143 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index efb689e..5908c92 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:784e203044122ffd664f9f212e046d79e39c28654ca47d0ecb30e41cd0894099 -size 53878 +oid sha256:6d6532c7b58c35c8b0b6e638dc18c032ae79ed39bc6e1e149d2693c2a80e6b5a +size 53844