dvratil pushed to kde-l10n (f22). "on F22+, remove kcontrol documentation that conflicts with plasma-workspace"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 11:09:38 UTC 2015


>From a40119507d0983151284b8c620832a6a87b76589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Wed, 1 Apr 2015 13:07:16 +0200
Subject: on F22+, remove kcontrol documentation that conflicts with
 plasma-workspace


diff --git a/kde-l10n.spec b/kde-l10n.spec
index 2710a71..8bf79b9 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: 2%{?dist}
+Release: 3%{?dist}
 
 Url:     http://www.kde.org
 License: LGPLv2
@@ -848,6 +848,7 @@ for i in $(cat %{SOURCE1000}) ; do
       rm -fv 4/$i/$j/messages/kde-runtime/kio_{applications,remote}.po
       rm -fv 4/$i/$j/messages/kdelibs/{kcm_baloofile,plasma_runner_baloosearchrunner}.po
       rm -fv 4/$i/$j/messages/applications/useraccount.po
+      rm -fv 4/$i/$j/docs/kde-runtime/kcontrol
       # Provided by kdeplasma-addons
       sed -i -e 's/add_subdirectory( *kdeplasma-addons *)/#add_subdirectory(kdeplasma-addons)/g' 4/$i/$j/messages/CMakeLists.txt
       # Provided by kf5-kfilemetada
@@ -1590,6 +1591,9 @@ rm -fv %{buildroot}%{_datadir}/locale/tr/ceviri_uygula.sh
 
 
 %changelog
+* Wed Apr 01 2015 Daniel Vrátil <dvratil at redhat.com> - 14.12.3-3
+- on F22+, remove kcontrol documentation that conflicts with plasma-workspace
+
 * 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)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-l10n.git/commit/?h=f22&id=a40119507d0983151284b8c620832a6a87b76589


More information about the scm-commits mailing list