[kde-l10n] s/kdepim45/kdepim44/ add Conflicts when including kdepim translations

Rex Dieter rdieter at fedoraproject.org
Wed Jan 26 18:46:28 UTC 2011


commit 84971579ef860b267ce220741734eaefc4a364ca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 26 12:45:31 2011 -0600

    s/kdepim45/kdepim44/
    add Conflicts when including kdepim translations

 kde-l10n.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/kde-l10n.spec b/kde-l10n.spec
index 3778ee8..c928b31 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -2,7 +2,7 @@
 %define buildall 0
 
 %if 0%{?fedora} < 15
-%define kdepim45 1
+%define kdepim44 1
 %endif
 
 Name: kde-l10n
@@ -85,7 +85,9 @@ BuildRequires: gettext
 BuildRequires: kdelibs4-devel >= %{version} 
 
 Requires: kde-filesystem
-%if 0%{?kdepim45}
+%if 0%{?kdepim44}
+Conflicts: kdepim > 6:4.5.90
+Conflicts: kdepim-runtime > 4.5.90
 Provides: kde-l10n-kdepim = 4.4.5-1
 %endif
 
@@ -783,7 +785,7 @@ done
 # upstream patches
 
 
-%if 0%{?kdepim45}
+%if 0%{?kdepim44}
 bzip2 -dc %{SOURCE500} | tar -xf -
 %endif
 


More information about the scm-commits mailing list