From 4191a1f2e7f31542db13f02158c46602153c29e2 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 4 Jan 2012 13:08:38 +0100
Subject: [PATCH] - ship documentation only in -doc subpackage and only license
 in   -devel (#540634) - thanks to Edward Sheldrake - -devel-doc subpackage
 requires -devel

---
 libvorbis.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libvorbis.spec b/libvorbis.spec
index 856e12b..7c7bde7 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.3.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -23,7 +23,7 @@ that support Ogg Vorbis.
 Summary: Development tools for Vorbis applications.
 Group: Development/Libraries
 Requires:	libogg-devel >= 2:1.1
-Requires:	libvorbis = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	vorbis-devel
 
 %description devel
@@ -33,6 +33,7 @@ needed to develop applications with Ogg Vorbis.
 %package devel-docs
 Summary: Documentation for developing Vorbis applications
 Group: Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
 BuildArch: noarch
 
 %description devel-docs
@@ -59,7 +60,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files
 %defattr(-,root,root)
-%doc COPYING
+%doc %dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/COPYING
 %{_libdir}/libvorbis.so.*
 %{_libdir}/libvorbisfile.so.*
 %{_libdir}/libvorbisenc.so.*
@@ -76,6 +78,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %files devel-docs
 %defattr(-,root,root)
 %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/COPYING
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 04 2012 Jindrich Novy <jnovy@redhat.com> 1.3.2-2
+- ship documentation only in -doc subpackage and only license
+  in -devel (#540634) - thanks to Edward Sheldrake
+- -devel-doc subpackage requires -devel
+
 * Wed Feb 09 2011 Adam Jackson <ajax@redhat.com> 1.3.2-1
 - libvorbis 1.3.2