rpms/kdelibs3/devel kdelibs3.spec,1.29,1.30

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs3.spec 
Log Message:
* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
- f9+: include kdeui symlink here + scriptlets to help rpm handle it



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kdelibs3.spec	23 May 2008 14:23:28 -0000	1.29
+++ kdelibs3.spec	24 May 2008 21:24:45 -0000	1.30
@@ -24,7 +24,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -384,7 +384,6 @@
 rm -f %{buildroot}%{_bindir}/checkXML
 rm -f %{buildroot}%{_bindir}/ksvgtopng
 rm -f %{buildroot}%{_bindir}/kunittestmodrunner
-rm -rf %{buildroot}%{_datadir}/apps/kdeui/
 rm -f %{buildroot}%{_datadir}/config/kdebug.areas
 rm -f %{buildroot}%{_datadir}/config/kdebugrc
 rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
@@ -430,6 +429,10 @@
 rm -rf %{buildroot}%{_datadir}/autostart/
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
+
+# kdeui for kde3
+rm -rf %{buildroot}%{_datadir}/apps/kdeui/
+ln -s  %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
 %endif
 
 %if 0%{?include_crystalsvg} == 0
@@ -449,6 +452,13 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
+%if "%{name}" != "kdelibs"
+rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
+
+%pre
+test -d %{_datadir}/apps/kdeui -a ! -L %{_datadir}/apps/kdeui && \
+  mv %{_datadir}/apps/kdeui %{_datadir}/apps/kdeui.rpm_remove ||:
+%endif
 
 %postun
 /sbin/ldconfig
@@ -579,8 +589,11 @@
 
 
 %changelog
+* Sat May 24 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-13
+- f9+: include kdeui symlink here + scriptlets to help rpm handle it
+
 * Fri May 23 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-12
-- omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (#447965)
+- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (#447965)
 
 * Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
 - (Only|Not)ShowIn=KDE3 patch (helps #446466)