[konsole] fix Conflicts: kdebase (wrong epoch)

Rex Dieter rdieter at fedoraproject.org
Fri Jul 22 02:49:09 UTC 2011


commit 5cea6c0568ae642d6f0694b2903faece7208820f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jul 21 21:54:33 2011 -0500

    fix Conflicts: kdebase (wrong epoch)

 konsole.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/konsole.spec b/konsole.spec
index ff97633..fd6b2f3 100644
--- a/konsole.spec
+++ b/konsole.spec
@@ -2,7 +2,7 @@
 Name:    konsole
 Summary: KDE Terminal emulator
 Version: 4.6.95
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+
 License: GPLv2 
@@ -16,7 +16,7 @@ BuildRequires: libXrender-devel
 
 Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 # when split occurred
-Conflicts: kdebase < 7:4.6.95-10
+Conflicts: kdebase < 6:4.6.95-10
 
 
 %description
@@ -63,6 +63,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konsole.des
 
 
 %changelog
+* Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-4
+- fix Conflicts: kdebase (wrong epoch)
+
 * Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.95-3
 - License: GPLv2 (per FAQ)
 


More information about the scm-commits mailing list