rpms/kdelibs/devel kdelibs.spec,1.223.2.21,1.223.2.22

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16724/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
rename js to kjs because of file conflict (kde#149840)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.21
retrieving revision 1.223.2.22
diff -u -r1.223.2.21 -r1.223.2.22
--- kdelibs.spec	13 Sep 2007 08:04:47 -0000	1.223.2.21
+++ kdelibs.spec	13 Sep 2007 22:11:52 -0000	1.223.2.22
@@ -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 @@
 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 @@
 
 
 %changelog
+* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
+- rename js to kjs because of file conflict (kde#149840)
+
 * Thu Sep 13 2007 Kevin Kofler <Kevin at 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