jreznik pushed to kdelibs3 (epel7). "- revert kdeui symlink hack (there be dragons) (..more)"

[notifications at fedoraproject.org]

>From 0fd5597264e1777093b58e2ba419d42a62340685 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue, 3 Jun 2008 21:03:27 +0000
Subject: - revert kdeui symlink hack (there be dragons) - unbreak -apidocs,
 add %check so this never ever happens again


diff --git a/kdelibs3.spec b/kdelibs3.spec
index 956a393..4be075d 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -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: 13%{?dist}
+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
@@ -112,6 +114,11 @@ 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
@@ -305,7 +312,7 @@ fi
 
 make %{?_smp_mflags}
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
   make %{?_smp_mflags} apidox
 %endif
 
@@ -318,7 +325,7 @@ make DESTDIR=%{buildroot} install
 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
@@ -430,10 +437,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
 # remove all crystalsvg icons for now
@@ -441,6 +451,17 @@ rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
 %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}
 
@@ -452,7 +473,7 @@ 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 "%{name}" != "kdelibs"
+%if 0%{?kdeui_symlink}
 rm -rf %{_datadir}/apps/kdeui.rpm_remove ||:
 
 %pre
@@ -580,7 +601,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
@@ -589,6 +610,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=0fd5597264e1777093b58e2ba419d42a62340685