diff --git a/kdelibs.spec b/kdelibs.spec index f2dd9ae..3cc7099 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -142,7 +142,7 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \ %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu -# fix file conflict with js (kde#149840) +# fix file conflict with mozilla's js (kde#149840) mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs # remove files which conflict with KDE 3 @@ -176,13 +176,13 @@ install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh %post /sbin/ldconfig ||: -%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %postun /sbin/ldconfig ||: -%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -%{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || : +xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : +xdg-desktop-menu forceupdate 2> /dev/null || : %clean