rpms/kdelibs3/F-9 kdelibs3.spec,1.27,1.28

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12495

Modified Files:
	kdelibs3.spec 
Log Message:
* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
- revert kdeui symlink hack (there be dragons) 
- unbreak -apidocs, add %check so this never ever happens again



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kdelibs3.spec	30 May 2008 19:41:47 -0000	1.27
+++ kdelibs3.spec	3 Jun 2008 22:28:25 -0000	1.28
@@ -14,7 +14,7 @@
 #global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
 %define qt3_ver %{qt3_version}
 # fix this?... -- Rex
-%define qt3_docdir %{_docdir}/qt-devel-%{qt_ver}
+%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
 
 %define kde_major_version 3
 
@@ -24,12 +24,14 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 11%{?dist}.1
+Release: 14%{?dist}
 
 %if 0%{?fedora} > 8
 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
@@ -100,7 +102,7 @@
 Requires(hint): sudo
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-#define   libkdnssd libkdnssd
+%define   libkdnssd libkdnssd
 # omit for now, may contribute to http://bugzilla.redhat.com/441222 
 #Requires: %{libkdnssd}
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
@@ -112,6 +114,11 @@
 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
@@ -170,8 +177,8 @@
 %if 0%{?include_crystalsvg}
 Provides: crystalsvg-icon-theme = %{version}-%{release}
 %else
-# this Requires could be made unconditional -- Rex
-#Requires: crystalsvg-icon-theme
+# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
+Requires: crystalsvg-icon-theme
 %endif
 
 
@@ -305,7 +312,7 @@
 
 make %{?_smp_mflags}
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
   make %{?_smp_mflags} apidox
 %endif
 
@@ -318,7 +325,7 @@
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
@@ -429,6 +436,13 @@
 rm -rf %{buildroot}%{_datadir}/autostart/
 # 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
@@ -437,6 +451,17 @@
 %endif
 
 
+%check
+ERROR=0
+%if 0%{?apidocs}
+if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
+  echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
+  ERROR=1
+fi 
+%endif
+exit $ERROR
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -448,6 +473,13 @@
 %{_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
@@ -569,7 +601,7 @@
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
@@ -578,6 +610,16 @@
 
 
 %changelog
+* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-14
+- revert kdeui symlink hack (there be dragons) 
+- unbreak -apidocs, add %%check so this never ever happens again
+
+* 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
+- f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850)
+
 * Thu May 15 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.9-11
 - (Only|Not)ShowIn=KDE3 patch (helps #446466)