[m17n-contrib/f15/master] revert the last change

pnemade pnemade at fedoraproject.org
Tue Mar 22 09:20:22 UTC 2011


commit 862b9ea2b595e444afc52e7d9770c26f42f6dbf6
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Mar 22 14:50:05 2011 +0530

    revert the last change

 m17n-contrib.spec |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/m17n-contrib.spec b/m17n-contrib.spec
index c634b33..478ec52 100644
--- a/m17n-contrib.spec
+++ b/m17n-contrib.spec
@@ -21,6 +21,56 @@ BuildArch: noarch
 BuildRequires: m17n-db-devel 
 Requires: m17n-db
 
+# FIXME: Remove these obsolets and provides in F16
+Obsoletes: m17n-contrib-assamese < 1.1.11
+Obsoletes: m17n-contrib-bengali < 1.1.11
+Obsoletes: m17n-contrib-czech < 1.1.11
+Obsoletes: m17n-contrib-esperanto < 1.1.11
+Obsoletes: m17n-contrib-gujarati < 1.1.11
+Obsoletes: m17n-contrib-hindi < 1.1.11
+Obsoletes: m17n-contrib-kannada < 1.1.11
+Obsoletes: m17n-contrib-kashmiri < 1.1.11
+Obsoletes: m17n-contrib-maithili < 1.1.11
+Obsoletes: m17n-contrib-malayalam < 1.1.11
+Obsoletes: m17n-contrib-marathi < 1.1.11
+Obsoletes: m17n-contrib-nepali < 1.1.11
+Obsoletes: m17n-contrib-oriya < 1.1.11
+Obsoletes: m17n-contrib-pashto < 1.1.11
+Obsoletes: m17n-contrib-punjabi < 1.1.11
+Obsoletes: m17n-contrib-russian < 1.1.11
+Obsoletes: m17n-contrib-sindhi < 1.1.11
+Obsoletes: m17n-contrib-sinhala < 1.1.11
+Obsoletes: m17n-contrib-tai < 1.1.11
+Obsoletes: m17n-contrib-tamil < 1.1.11
+Obsoletes: m17n-contrib-telugu < 1.1.11
+Obsoletes: m17n-contrib-urdu < 1.1.11
+Obsoletes: m17n-contrib-vietnamese < 1.1.11
+
+Provides: m17n-contrib-assamese = %{version}-%{release}
+Provides: m17n-contrib-bengali = %{version}-%{release}
+Provides: m17n-contrib-czech = %{version}-%{release}
+Provides: m17n-contrib-esperanto = %{version}-%{release}
+Provides: m17n-contrib-gujarati = %{version}-%{release}
+Provides: m17n-contrib-hindi = %{version}-%{release}
+Provides: m17n-contrib-kannada = %{version}-%{release}
+Provides: m17n-contrib-kashmiri = %{version}-%{release}
+Provides: m17n-contrib-maithili = %{version}-%{release}
+Provides: m17n-contrib-malayalam = %{version}-%{release}
+Provides: m17n-contrib-marathi = %{version}-%{release}
+Provides: m17n-contrib-nepali = %{version}-%{release}
+Provides: m17n-contrib-oriya = %{version}-%{release}
+Provides: m17n-contrib-pashto = %{version}-%{release}
+Provides: m17n-contrib-punjabi = %{version}-%{release}
+Provides: m17n-contrib-russian = %{version}-%{release}
+Provides: m17n-contrib-sindhi = %{version}-%{release}
+Provides: m17n-contrib-sinhala = %{version}-%{release}
+Provides: m17n-contrib-tai = %{version}-%{release}
+Provides: m17n-contrib-tamil = %{version}-%{release}
+Provides: m17n-contrib-telugu = %{version}-%{release}
+Provides: m17n-contrib-urdu = %{version}-%{release}
+Provides: m17n-contrib-vietnamese = %{version}-%{release}
+
+
 %description
 This package contains contributed multilingualization (m17n) datafiles
 for the m17n-lib project.
@@ -30,6 +80,10 @@ Summary:  Extra m17n-contrib files
 Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
+Obsoletes: m17n-contrib-chinese < 1.1.11
+Provides: m17n-contrib-chinese = %{version}-%{release}
+
+
 %description extras
 m17n-db extra files for input maps that are less used.
 
@@ -107,7 +161,6 @@ rm -rf $RPM_BUILD_ROOT/%{_bindir}
 %changelog
 * Tue Mar 22 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.1.12-4
 - Resolves: rh#679289 - please include kashmiri inscript keyboard
-- Removed Obsoletes and Provides added in f14
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list