rpms/xosd/devel xosd.spec,1.5,1.6

[Matthias Saou (thias)]

Changeset from: thias

Update of /cvs/extras/rpms/xosd/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv8556/xosd/devel

Modified Files:
	xosd.spec 
Log Message:
Release bumping to provide upgrade path from non-fedora.us packages.
A few minor tweaks here and there.



Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xosd.spec	8 Nov 2004 05:36:03 -0000	1.5
+++ xosd.spec	11 Nov 2004 19:21:37 -0000	1.6
@@ -2,14 +2,13 @@
 
 Name:           xosd
 Version:        2.2.12
-Release:        0.fdr.1.2
-Epoch:          0
+Release:        2
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ignavus.net/software.html
-Source:         http://www.ignavus.net/xosd-2.2.12.tar.bz2
+Source:         http://www.ignavus.net/xosd-%{version}.tar.bz2
 Patch0:         %{name}-aclocal18.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +24,7 @@
 %package        devel
 Summary:        Development files for the XOSD on-screen display library
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}, XFree86-devel
+Requires:       %{name} = %{version}-%{release}, XFree86-devel
 
 %description    devel
 The xosd-devel package contains static libraries, header files and
@@ -35,8 +34,8 @@
 %package     -n xmms-%{name}
 Summary:        An XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
-Requires:       %{name} = %{epoch}:%{version}-%{release}, xmms
-Obsoletes:      %{name}-xmms
+Requires:       %{name} = %{version}-%{release}, xmms
+Obsoletes:      %{name}-xmms <= 2.2.12
 
 %description -n xmms-%{name}
 An X MultiMedia System plugin to display information on-screen through
@@ -95,6 +94,10 @@
 
 
 %changelog
+* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.2.12-2
+- Bump release to provide Extras upgrade path.
+- Remove zero epochs.
+
 * Tue Sep 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.12-0.fdr.1
 - Update to 2.2.12.
 - Disable dependency tracking to speed up the build.