From 35417f7d2e82babd9859124ca9fb0fb0b93d8bfd072d12e626539a1497cf2c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 5 Jul 2013 19:12:59 +0000
Subject: [PATCH] - Remove the empty data dir from the doc package filelist. -
 Explicitly use samba instead of the name macro to define the docbook dir.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=324
---
 patches.tar.bz2      | 4 ++--
 samba-doc.spec       | 5 ++---
 samba.changes        | 6 ++++++
 samba.spec           | 5 ++---
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index ee437d0..e792e18 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b57e28339465d52fd319ecfcb116e56101c8dab9d63c8a7c5c83809329f8783
-size 38071
+oid sha256:1ca6bd8e5d6219ef608280c2d50878042e30a5038f4cbd570b1b7243100b7ebf
+size 38021
diff --git a/samba-doc.spec b/samba-doc.spec
index e9602ee..7c488a1 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -129,7 +129,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3034
+%define SOURCE_TIMESTAMP 3035
 %define BRANCH %{version}
 Version:        3.6.16
 Release:        0
@@ -175,7 +175,7 @@ BuildRequires:  ccache
 # Define some global directories
 ################################
 %define	DOCDIR %{_defaultdocdir}/samba
-%define	DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook
+%define	DOCBOOKDIR %{_defaultdocdir}/samba/docbook
 %define	LOGDIR %{_localstatedir}/log/samba
 %define	LOCKDIR %{_localstatedir}/lib/samba
 %define	CONFIGDIR %{_sysconfdir}/samba
@@ -400,7 +400,6 @@ rm -f \
 %files -f filelist-samba-doc
 %defattr(-,root,root)
 %dir %{DOCDIR}
-%dir %{_datadir}/samba
 %doc %{_datadir}/susehelp
 %endif
 
diff --git a/samba.changes b/samba.changes
index 2851761..c054af9 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  5 18:48:26 UTC 2013 - lmuelle@suse.com
+
+- Remove the empty data dir from the doc package filelist.
+- Explicitly use samba instead of the name macro to define the docbook dir.
+
 -------------------------------------------------------------------
 Tue Jul  2 13:39:30 UTC 2013 - ddiss@suse.com
 
diff --git a/samba.spec b/samba.spec
index 59d3667..8103d07 100644
--- a/samba.spec
+++ b/samba.spec
@@ -129,7 +129,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3034
+%define SOURCE_TIMESTAMP 3035
 %define BRANCH %{version}
 Version:        3.6.16
 Release:        0
@@ -182,7 +182,7 @@ BuildRequires:  ccache
 # Define some global directories
 ################################
 %define	DOCDIR %{_defaultdocdir}/samba
-%define	DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook
+%define	DOCBOOKDIR %{_defaultdocdir}/samba/docbook
 %define	LOGDIR %{_localstatedir}/log/samba
 %define	LOCKDIR %{_localstatedir}/lib/samba
 %define	CONFIGDIR %{_sysconfdir}/samba
@@ -1562,7 +1562,6 @@ fi
 %files doc -f filelist-samba-doc
 %defattr(-,root,root)
 %dir %{DOCDIR}
-%dir %{_datadir}/samba
 %doc %{_datadir}/susehelp
 %endif
 
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 522167a..fd4f69c 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:2ccefb2a0e44277616a0e3b1eab27cf071c0d621edb48ad90d76f242ff1eb644
-size 53620
+oid sha256:9325fa7c80957cf1f5174ef49def1a9ea53d2194887290bedb25e3ab1f350a26
+size 53560