rpms/kdemultimedia-extras/FC-6 kdemultimedia-extras.spec,1.14,1.15

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4338/FC-6

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Mar  7 2007 Michael Schwendt <mschwendt[AT]users.sf.net> 6:3.5.6-5
- fix the fatal "Conflicts" with kdemultimedia-extras-nonfree, which
  breaks upgrades - the package does not have Epoch 6

Loading "installonlyn" plugin
Setting up Update Process
Setting up repositories
Reading repository metadata in from local files
Resolving Dependencies
--> Populating transaction set with selected packages. Please wait.
---> Package ktorrent.i386 0:2.1.1-2.fc6 set to be updated
---> Package kdemultimedia-extras.i386 6:3.5.6-4.fc6 set to be updated
---> Package gpgme.i386 0:1.1.4-1.fc6 set to be updated
--> Running transaction check
--> Processing Conflict: kdemultimedia-extras conflicts kdemultimedia-extras-nonfree < 6:3.5.6-3
--> Finished Dependency Resolution
Error: kdemultimedia-extras conflicts with kdemultimedia-extras-nonfree < 6:3.5.6-3



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdemultimedia-extras.spec	23 Feb 2007 20:24:45 -0000	1.14
+++ kdemultimedia-extras.spec	7 Mar 2007 11:21:17 -0000	1.15
@@ -27,7 +27,7 @@
 %define _with_taglib --with-taglib
 %define _with_xine --with-xine
 # moved xine_artsplugin,kfile_mp3 from there -- Rex
-Conflicts: kdemultimedia-extras-nonfree < 6:3.5.6-3
+Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3
 %endif
 
 %if "%{?nonfree}" == "1"
@@ -64,7 +64,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.6
-Release: 4%{?dist}%{?kde}
+Release: 5%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -502,6 +502,10 @@
 
 
 %changelog
+* Wed Mar  7 2007 Michael Schwendt <mschwendt[AT]users.sf.net> 6:3.5.6-5
+- fix the fatal "Conflicts" with kdemultimedia-extras-nonfree, which
+  breaks upgrades - the package does not have Epoch 6
+
 * Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-4
 - don't omit .la files yet, fedora's kdelibs hasn't been patched (yet)