rpms/k3b-extras/FC-4 k3b-extras.spec,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29725

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/FC-4/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:51:33 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12