rpms/kdelibs/devel kdelibs.spec,1.321,1.322

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs.spec 
Log Message:
* Fri May 23 2008 Rex Dieter <rdieter at fedoraproejct.org> - 4.0.72-7
- -common: provide %_datadir/apps/kdeui for kde3 apps (#447965)



Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- kdelibs.spec	22 May 2008 18:44:00 -0000	1.321
+++ kdelibs.spec	23 May 2008 14:12:48 -0000	1.322
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.72
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -227,11 +227,15 @@
 %if 0%{?rest}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-# see also use-of/patching of XDG_MENU_PREFIX in kdebase
+# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-%if "%{name}" != "kdelibs"
+%if "%{name}" == "kdelibs"
+# kdeui for kde3
+mkdir -p %{buildroot}%{_datadir}/apps
+ln -s  %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
+%else
 # remove files which conflict with KDE 3
 rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
       %{buildroot}%{_kde4_bindir}/kunittestmodrunner
@@ -249,6 +253,7 @@
   case "$i" in
     libkdeinit4_*.so)
       ;;
+    ## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex
     # don't move Phonon, non-KDE apps want to use it
     libphonon.so)
       ;;
@@ -340,6 +345,7 @@
 %{_kde4_configdir}/ui/ui_standards.rc
 %{_kde4_docdir}/HTML/en/common
 %{_kde4_datadir}/locale/all_languages/
+%{_datadir}/apps/kdeui
 %endif
 
 %files devel
@@ -364,6 +370,9 @@
 
 
 %changelog
+* Fri May 23 2008 Rex Dieter <rdieter at fedoraproejct.org> - 4.0.72-7
+- -common: provide %%_datadir/apps/kdeui for kde3 apps (#447965)
+
 * Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.72-6
 - kstandarddirs hack to search /etc/kde