[kde-l10n] - Conflicts: kde-i18n < 1:3.5.10-13 (when klickety moved, #657225)

Rex Dieter rdieter at fedoraproject.org
Thu Jan 27 12:58:20 UTC 2011


commit c4dec17cf5e84affc4917175e54635c1d36c6cd2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 27 06:57:44 2011 -0600

    - Conflicts: kde-i18n < 1:3.5.10-13 (when klickety moved, #657225)

 kde-l10n.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/kde-l10n.spec b/kde-l10n.spec
index c928b31..3129c56 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -7,7 +7,7 @@
 
 Name: kde-l10n
 Version: 4.6.0
-Release: 1%{dist}
+Release: 2%{dist}
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Group: User Interface/Desktops
@@ -91,6 +91,9 @@ Conflicts: kdepim-runtime > 4.5.90
 Provides: kde-l10n-kdepim = 4.4.5-1
 %endif
 
+# klickety moved kde-i18n -> kde-l10n (#656523)
+Conflicts: kde-i18n < 1:3.5.10-13
+
 # Unfortunately, these are currently not available
 Obsoletes: kde-l10n-Kurdish < 4.3.98
 Obsoletes: kde-l10n-Bengali-India < 4.4.0
@@ -1556,6 +1559,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.0-2
+- Conflicts: kde-i18n < 1:3.5.10-13 (when klickety moved, #657225)
+
 * Fri Jan 21 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.0-1
 - 4.6.0
 - obsolete Esperanto, Frisian and Malayalam (not a part of 4.6.0)


More information about the scm-commits mailing list