rpms/kdelibs3/devel kdelibs3.spec,1.52,1.53

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9342

Modified Files:
	kdelibs3.spec 
Log Message:
* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-8
- disable -apidocs (f11+, temporarily)
- cleanup unused kdeui_symlink hack baggage



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdelibs3.spec	26 Feb 2009 20:48:24 -0000	1.52
+++ kdelibs3.spec	27 Feb 2009 16:18:52 -0000	1.53
@@ -27,7 +27,10 @@
 
 %define make_cvs 1
 
+# disable temporarily for f11+, while rawhide doxygen hang can be fixed
+%if 0%{?fedora} < 11
 %define apidocs 1
+%endif
 
 # We always include this here now because kdeartwork 4 has moved on to
 # icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
@@ -42,8 +45,6 @@
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
-# define to enable kdeui symlink hack -- Rex
-#define kdeui_symlink 1
 %else
 Name: kdelibs
 Epoch: 6
@@ -129,11 +130,6 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%if 0%{?kdeui_symlink}
-# for %_kde4_* macros
-BuildRequires: kde4-macros(api) 
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-%endif
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel cups
@@ -475,12 +471,6 @@
 # don't show kresources
 sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 
-%if 0%{?kdeui_symlink}
-# kdeui for kde3, kinda workaround http://bugs.kde.org/157850
-# and save space by sharing
-rm -rf %{buildroot}%{_datadir}/apps/kdeui/
-ln -s  %{_kde4_appsdir}/kdeui %{buildroot}%{_datadir}/apps/kdeui
-%endif
 %endif
 
 %if 0%{?include_crystalsvg} == 0
@@ -511,13 +501,6 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
-%if 0%{?kdeui_symlink}
-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
@@ -649,6 +632,10 @@
 
 
 %changelog
+* Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-8
+- disable -apidocs (f11+, temporarily)
+- cleanup unused kdeui_symlink hack baggage
+
 * Wed Feb 25 2009 Than Ngo <than at redhat.com> - 3.5.10-7
 - fix files conflicts with 4.2.x
 - fix build issue with gcc-4.4