- disable -apidocs (f11+, temporarily)

- cleanup unused kdeui_symlink hack baggage
This commit is contained in:
Rex Dieter 2009-02-27 16:18:52 +00:00
parent fcf6df2cee
commit 104e541c84
1 changed files with 7 additions and 20 deletions

View File

@ -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 @@ Release: 7%{?dist}
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(pre): coreutils
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 @@ rm -f %{buildroot}%{_bindir}/preparetips
# 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 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_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 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Fri Feb 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-8
- disable -apidocs (f11+, temporarily)
- cleanup unused kdeui_symlink hack baggage
* Wed Feb 25 2009 Than Ngo <than@redhat.com> - 3.5.10-7
- fix files conflicts with 4.2.x
- fix build issue with gcc-4.4