[kdepim-runtime] - omit translations (conflicts with kde-l10n-4.5.95)

[Rex Dieter]

commit c439b38cf218d2b86b56912f167bd63010fe3f50
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 12 07:56:13 2011 -0600

    - omit translations (conflicts with kde-l10n-4.5.95)

 kdepim-runtime-4.5.94.1-no_translations.patch |    9 +++++++++
 kdepim-runtime.spec                           |   14 ++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/kdepim-runtime-4.5.94.1-no_translations.patch b/kdepim-runtime-4.5.94.1-no_translations.patch
new file mode 100644
index 0000000..76531c5
--- /dev/null
+++ b/kdepim-runtime-4.5.94.1-no_translations.patch
@@ -0,0 +1,9 @@
+diff -up kdepim-runtime-4.5.94.1/CMakeLists.txt.no_translations kdepim-runtime-4.5.94.1/CMakeLists.txt
+--- kdepim-runtime-4.5.94.1/CMakeLists.txt.no_translations	2011-01-10 08:00:07.000000000 -0600
++++ kdepim-runtime-4.5.94.1/CMakeLists.txt	2011-01-12 07:52:53.188300844 -0600
+@@ -195,4 +195,4 @@ macro_display_feature_log()
+ 
+ find_package(Msgfmt REQUIRED)
+ find_package(Gettext REQUIRED)
+-add_subdirectory(po)
++#add_subdirectory(po)
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index f84b059..4531bfe 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -2,7 +2,7 @@
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.5.94.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -13,6 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # show the Akonadi KCM in System Settings (#565420)
 Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 
+## upstream patches
+# kde-l10n-4.5.95 (still) contains conflicting translations, omit here (for now)
+Patch100: kdepim-runtime-4.5.94.1-no_translations.patch
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
@@ -55,6 +59,8 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %patch0 -p1 -b .show_akonadi_kcm
 
+%patch100 -p1 -b .no_translations
+
 
 %build
 mkdir -p %{_target_platform}
@@ -70,7 +76,8 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --all-name --with-kde
+# lack of translations non-fatal, see no_translations patch above
+%find_lang %{name} --all-name --with-kde || touch %{name}.lang
 
 
 %check
@@ -131,6 +138,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 12 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.94.1-2
+- omit translations (conflicts with kde-l10n-4.5.95)
+
 * Tue Jan 11 2011 Rex Dieter <rdieter at fedoraproject.org> 4.5.94.1-1
 - 4.5.94.1 (4.6beta4)