kkofler pushed to kde-l10n (master). "on F22+, remove .po files that conflict with ktp-desktop-applets (#1207128) (..more)"

[notifications at fedoraproject.org]

>From 31a44eab60823d33c8640f1412ec1da6039d453a Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Tue, 31 Mar 2015 00:13:21 +0200
Subject: on F22+, remove .po files that conflict with ktp-desktop-applets
 (#1207128)

* Mon Mar 30 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 14.12.3-2
- on F22+, remove .po files that conflict with ktp-desktop-applets (#1207128)

diff --git a/kde-l10n.spec b/kde-l10n.spec
index 5f8087c..2710a71 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -6,7 +6,7 @@
 Name:    kde-l10n
 Summary: Internationalization support for KDE
 Version: 14.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Url:     http://www.kde.org
 License: LGPLv2
@@ -861,6 +861,8 @@ for i in $(cat %{SOURCE1000}) ; do
       rm -fv 4/$i/$j/messages/kde-runtime/{filetypes,kcmshell,kdesu,kioclient,kmimetypefinder,kstart,ktraderclient}.po
       # Provided by khelpcenter
       rm -fv 4/$i/$j/messages/kde-runtime/{htmlsearch,kcmhtmlsearch,khelpcenter}.po
+      # Provided by ktp-desktop-applets
+      rm -fv 4/$i/$j/messages/kdenetwork/plasma_applet_org.kde.ktp-{contact,presence}.po
 %endif
 
     fi
@@ -1588,6 +1590,12 @@ rm -fv %{buildroot}%{_datadir}/locale/tr/ceviri_uygula.sh
 
 
 %changelog
+* Mon Mar 30 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 14.12.3-2
+- on F22+, remove .po files that conflict with ktp-desktop-applets (#1207128)
+
+* Mon Mar 02 2015 Than Ngo <than at redhat.com> - 14.12.3-1
+- 14.12.3
+
 * Tue Feb 24 2015 Than Ngo <than at redhat.com> - 14.12.2-1
 - 14.12.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-l10n.git/commit/?h=master&id=31a44eab60823d33c8640f1412ec1da6039d453a