From 391fd38c2d0263e1197d9506d869d357ded465368ba4e0adb4f1d4e55b8bae2d Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Tue, 29 Nov 2011 09:11:12 +0000
Subject: [PATCH] Accepting request 94157 from
 home:coolo:branches:openSUSE:Factory

- avoid packaging files twice

OBS-URL: https://build.opensuse.org/request/show/94157
OBS-URL: https://build.opensuse.org/package/show/server:search/xapian-core?expand=0&rev=40
---
 xapian-core.changes |  5 +++++
 xapian-core.spec    | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/xapian-core.changes b/xapian-core.changes
index c94caf2..1fd4b1e 100644
--- a/xapian-core.changes
+++ b/xapian-core.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 28 19:46:42 UTC 2011 - coolo@suse.com
+
+- avoid packaging files twice
+
 -------------------------------------------------------------------
 Tue Sep 13 09:29:48 UTC 2011 - prusnak@opensuse.org
 
diff --git a/xapian-core.spec b/xapian-core.spec
index f316335..1f31398 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -20,7 +20,7 @@
 Name:           xapian-core
 Version:        1.2.7
 Release:        1
-License:        GPLv2
+License:        GPL-2.0
 Summary:        The Xapian Probabilistic Information Retrieval Library
 Url:            http://www.xapian.org/
 Group:          Productivity/Databases/Servers
@@ -38,7 +38,6 @@ offers a highly adaptable toolkit that allows developers to easily add advanced
 indexing and search facilities to applications
 
 %package -n libxapian22
-
 Summary:        Xapian search engine libraries
 Group:          Development/Libraries/C and C++
 Provides:       xapian-core-libs
@@ -50,7 +49,6 @@ indexing and search facilities to applications. This package provides the
 libraries for applications using Xapian functionality
 
 %package -n libxapian-devel
-
 Summary:        Files needed for building packages which use Xapian
 Group:          Development/Libraries/C and C++
 Requires:       gcc-c++
@@ -65,7 +63,6 @@ indexing and search facilities to applications. This package provides the
 files needed for building packages which use Xapian
 
 %package doc
-
 Summary:        Documentation for Xapian-core libraries
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
@@ -77,7 +74,6 @@ indexing and search facilities to applications. This package provides the
 files needed for building packages which use Xapian
 
 %package examples
-
 Summary:        Examples for Xapian-core libraries
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
@@ -100,18 +96,25 @@ make %{?_smp_mflags}
 rm -rf examples/{.libs,.deps,.dirstamp,*.o,quest,delve,simplesearch,simpleexpand,simpleindex,copydatabase}
 cp -vr examples  %{buildroot}%{_docdir}/%{name}/
 find . -name \*.spec -delete
-fdupes %{buildroot}%{_defaultdocdir}/%{name}
+install -m 644 AUTHORS COPYING ChangeLog INSTALL README NEWS HACKING PLATFORMS ChangeLog.examples %{buildroot}%{_docdir}/%{name}
+fdupes %{buildroot}%{_docdir}/%{name}
 
 %post -n libxapian22 -p /sbin/ldconfig
 
 %postun -n libxapian22 -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog INSTALL README NEWS HACKING PLATFORMS ChangeLog.examples
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/AUTHORS
+%{_docdir}/%{name}/COPYING
+%{_docdir}/%{name}/ChangeLog
+%{_docdir}/%{name}/INSTALL
+%{_docdir}/%{name}/README
+%{_docdir}/%{name}/NEWS
+%{_docdir}/%{name}/HACKING
+%{_docdir}/%{name}/PLATFORMS
+%{_docdir}/%{name}/ChangeLog.examples
 %{_bindir}/xapian-tcpsrv
 %{_bindir}/xapian-progsrv
 %{_bindir}/quest