From 138f6e09aea36155575b03640dc91a3576ea1472 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 8 Feb 2007 15:02:56 +0000
Subject: [PATCH] Package review cleanups, don't ship static libraries

---
 libvorbis.spec | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/libvorbis.spec b/libvorbis.spec
index 18afecf..954732f 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,16 +1,15 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.1.2
-Release: 	1.2.1
+Release: 	2%{?dist}	
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.xiph.org/
-Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Patch:		libvorbis-1.0-m4.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libogg >= 2:1.1
-BuildPrereq: 	libogg-devel >= 2:1.1
+Source:	        http://downloads.xiph.org/releases/vorbis/libvorbis-1.1.2.tar.gz	
+Patch0:		libvorbis-1.0-m4.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
+BuildRequires: 	libogg-devel >= 2:1.1
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and royalty-free,
@@ -24,7 +23,7 @@ that support Ogg Voribs.
 Summary: Development tools for Vorbis applications.
 Group: Development/Libraries
 Requires:	libogg-devel >= 2:1.1
-Requires:	libvorbis = %{epoch}:%{version}
+Requires:	libvorbis = %{epoch}:%{version}-%{release}
 Obsoletes:	vorbis-devel
 
 %description devel
@@ -34,7 +33,7 @@ needed to develop applications with Ogg Vorbis.
 %prep
 
 %setup -q
-%patch -p1 -b .m4-patch
+%patch0 -p1 -b .m4
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
 # link to .pdf spec rather than ship redundant copy
@@ -42,7 +41,7 @@ perl -p -i -e "s@Vorbis_I_spec.pdf@http://www.xiph.org/ogg/vorbis/doc/Vorbis_I_s
 rm -f doc/Vorbis_I_spec.pdf
 
 %build
-%configure --with-ogg-libraries=%{_libdir}
+%configure --with-ogg-libraries=%{_libdir} --disable-static
 make
 
 %install
@@ -65,11 +64,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %defattr(-,root,root)
 %doc doc/*
 %{_includedir}/vorbis
-%{_libdir}/libvorbis.a
 %{_libdir}/libvorbis.so
-%{_libdir}/libvorbisfile.a
 %{_libdir}/libvorbisfile.so
-%{_libdir}/libvorbisenc.a
 %{_libdir}/libvorbisenc.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/vorbis.m4
@@ -82,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Feb  8 2007 Matthias Clasen <mclasen@redhat.com> - 1:1.1.2-2
+- Package review cleanups
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:1.1.2-1.2.1
 - rebuild