rename js to kjs because of file conflict (kde#149840)

This commit is contained in:
Kevin Kofler 2007-09-13 22:11:52 +00:00
parent ef77584645
commit 0ac5f387ae

View File

@ -4,7 +4,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 7%{?dist}
Release: 8%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -141,6 +141,9 @@ 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)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
@ -226,6 +229,9 @@ rm -rf %{buildroot}
%changelog
* Fri Sep 14 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)
* Thu Sep 13 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3