diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index 5a0c9f255..a26ec956c 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -388,6 +388,8 @@ Homepage: http://accessibility.kde.org/developer/kttsd %{tde_datadir}/apps/kttsd/ %{tde_datadir}/icons/hicolor/16x16/actions/female.png %{tde_datadir}/icons/hicolor/16x16/actions/male.png +%{tde_datadir}/icons/hicolor/*/apps/kttsd.png +%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png %{tde_datadir}/services/tdetexteditor_kttsd.desktop %{tde_datadir}/services/kttsd.desktop %if 0%{?with_akode} @@ -489,6 +491,9 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +# Update icons for some control center modules +%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|" + %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -530,6 +535,14 @@ 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 +# 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/" +pushd "%{?buildroot}%{tde_datadir}/icons" +for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kttsd.png ;done +for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done +popd + # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -r kmag Utility Accessibility diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 1e3f20d96..a6daaf9c9 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -1274,24 +1274,24 @@ export PATH="%{tde_bindir}:${PATH}" # Disable MPEG support entirely %if 0%{?with_mpeg} == 0 - %__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay - %__rm %{?buildroot}%{tde_bindir}/yaf-* - %__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib* - %__rm %{?buildroot}%{tde_libdir}/libarts_splay.* - %__rm %{?buildroot}%{tde_libdir}/libmpeg* - %__rm %{?buildroot}%{tde_libdir}/libyaf* - %__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass - %__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass - %__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass - %__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass - %__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass - %__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass +%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay +%__rm %{?buildroot}%{tde_bindir}/yaf-* +%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib* +%__rm %{?buildroot}%{tde_libdir}/libarts_splay.* +%__rm %{?buildroot}%{tde_libdir}/libmpeg* +%__rm %{?buildroot}%{tde_libdir}/libyaf* +%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass +%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass +%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass +%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass +%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass +%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass %endif # Copy missing icons from 'crystalsvg' theme (tdelibs) mkdir -p $RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64}/apps/ pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/ -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png;done +for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done popd # Updates applications categories for openSUSE