rpms/kdelibs/devel kdelibs.spec,1.223.2.23,1.223.2.24

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Sep 20 14:41:49 UTC 2007


Author: rdieter

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Log Message:
don't use %%kde4_bindir in scriptets



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.23
retrieving revision 1.223.2.24
diff -u -r1.223.2.23 -r1.223.2.24
--- kdelibs.spec	20 Sep 2007 14:24:32 -0000	1.223.2.23
+++ kdelibs.spec	20 Sep 2007 14:41:16 -0000	1.223.2.24
@@ -142,7 +142,7 @@
 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 @@
 
 %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




More information about the scm-commits mailing list