From 54795cd33acb191a4dfeac6bd681d4d4172abd7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 29 Oct 2014 23:49:19 +0100 Subject: [PATCH] RPM Packaging: update tdeaccessibility --- .../tdeaccessibility-14.0.0.spec | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index f130edbb2..a7e0f536b 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -154,6 +154,13 @@ This package is part of Trinity, as a component of the TDE accessibility module. %files -n trinity-tde-icons-mono %defattr(-,root,root,-) +%dir %{tde_datadir}/icons/mono +%dir %{tde_datadir}/icons/mono/scalable +%dir %{tde_datadir}/icons/mono/scalable/actions +%dir %{tde_datadir}/icons/mono/scalable/apps +%dir %{tde_datadir}/icons/mono/scalable/devices +%dir %{tde_datadir}/icons/mono/scalable/mimetypes +%dir %{tde_datadir}/icons/mono/scalable/places %{tde_datadir}/icons/mono/index.theme %{tde_datadir}/icons/mono/scalable/*/*.svgz @@ -383,7 +390,7 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{tde_libdir}/libkttsd.so.* %{tde_tdeappdir}/kcmkttsd.desktop %{tde_tdeappdir}/kttsmgr.desktop -%{tde_datadir}/apps/tdetexteditor_kttsd/tdetexteditor_kttsdui.rc +%{tde_datadir}/apps/tdetexteditor_kttsd/ %exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl %{tde_datadir}/apps/kttsd/ %{tde_datadir}/icons/hicolor/16x16/actions/female.png @@ -536,6 +543,11 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz +# Move desktop files to correct XDG location +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}" + # Adds missing icons in 'hicolor' theme # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. %__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/" @@ -554,13 +566,6 @@ popd %suse_update_desktop_file kcmkttsd Utility Accessibility %endif -# Move desktop files to correct location -%if 0%{?opensuse_bs} == 0 || 0%{?suse_version} == 0 -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}" -%endif - # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}"