From 4830ba27c941b3ffb2aea6e9768758c839172523e2b9f80ae5f096cff65de215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 20 Nov 2015 10:48:38 +0000
Subject: [PATCH] Avoid conflict with perl-Parse-Yapp

Both install %{perl_vendorlib}/Parse/Yapp/Driver.pm so we exclude the
directory and the one particular file to catch potential more installs
later too

This is a follow up to
Cleanup and enhance the pidl sub package.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=511
---
 patches.tar.bz2      | 4 ++--
 samba.spec           | 7 ++++---
 vendor-files.tar.bz2 | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 8b31c12..c7eb226 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a8ca8635a788d7408600ec1fdcefddb78a22e47e30e76d1526561585594b7a7
-size 29343
+oid sha256:60c016eaf0856d6a5a6c3f52b4e6814e8baf79d91a023db4d66e3c01909ac581
+size 29381
diff --git a/samba.spec b/samba.spec
index a30d6ba..6b6106b 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3523
+%define SOURCE_TIMESTAMP 3531
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -2005,13 +2005,14 @@ fi
 %defattr(-,root,root)
 %dir %{perl_vendorlib}/Parse
 %dir %{perl_vendorlib}/Parse/Pidl
-%dir %{perl_vendorlib}/Parse/Yapp
 %{perl_vendorlib}/Parse/Pidl.pm*
 %{perl_vendorlib}/Parse/Pidl/*
-%{perl_vendorlib}/Parse/Yapp/*
 %{_mandir}/man1/pidl.1.*
 %{_mandir}/man3/Parse::Pidl::*.3pm.*
 %{_bindir}/pidl
+# both are part of perl-Parse-Yapp
+%exclude %dir %{perl_vendorlib}/Parse/Yapp
+%exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm
 
 %files python
 %defattr(-,root,root)
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 918f819..4781c65 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:3219007fcf5801f63f6c8627edd44b862b12776ad795a6b60e74df41d517635a
-size 52993
+oid sha256:afd8855af366d573c48cd86a19c7f963d9716033412db6515bec24d2f8c89ea9
+size 52904