rpms/vorbis-tools/devel vorbis-tools.spec,1.30,1.31

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/vorbis-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18365

Modified Files:
	vorbis-tools.spec 
Log Message:
* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.n> - 1:1.1.1.svn20070412-5
- Minor specfile cleanups for merge review (bz 226532)



Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vorbis-tools.spec	5 Oct 2007 04:36:21 -0000	1.30
+++ vorbis-tools.spec	15 Nov 2007 19:02:08 -0000	1.31
@@ -1,10 +1,10 @@
-Summary: The Vorbis General Audio Compression Codec tools.
+Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.1.1.svn20070412
-Release:	4%{?dist}
+Release:	5%{?dist}
 Epoch:		1
-Group: Applications/Multimedia
-License:	GPL
+Group:		Applications/Multimedia
+License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.0-build.patch
@@ -26,8 +26,8 @@
 # For vorbis-tools-svn20070412-libcurl.patch
 BuildRequires:  autoconf
 
-Obsoletes:	vorbis
-Provides:	vorbis
+Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
+Provides:	vorbis = %{epoch}:%{version}-%{release}
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
@@ -70,6 +70,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.n> - 1:1.1.1.svn20070412-5
+- Minor specfile cleanups for merge review (bz 226532)
+
 * Thu Oct 04 2007 Todd Zullinger <tmz at pobox.com> - 1:1.1.1.svn20070412-4
 - Upstream patch to fix oggdec writing silent wav files (#244757)