rpms/kdepimlibs/devel kdepimlibs.spec,1.69,1.70

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepimlibs.spec 
Log Message:
* Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- multilib conflicts (#485659)
- kde4/devel symlinks: blacklist only known conflicts



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdepimlibs.spec	22 Jan 2009 17:16:54 -0000	1.69
+++ kdepimlibs.spec	16 Feb 2009 16:21:39 -0000	1.70
@@ -12,10 +12,11 @@
 #endif
 
 %define akonadi_version 1.1.1
+%define debug 1 
 
 Name: kdepimlibs
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -38,12 +39,6 @@
 BuildRequires: openldap-devel
 BuildRequires: libical-devel >= 0.33
 
-# work around circular dependency from kdelibs4-devel
-# pulling in phonon-backend-xine
-#BuildRequires: phonon-backend-gstreamer
-
-## upstream patches
-
 %if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -80,17 +75,17 @@
 
 %prep
 %setup -q -n kdepimlibs-%{version}
-%patch0 -p1
+%{?debug:%patch0 -p1}
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} --debug-output ..
+%{cmake_kde4} %{?debug:--debug-output} ..
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 %endif
 
 # build apidocs
@@ -106,15 +101,22 @@
 %if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# hack around HTML doc multilib conflicts
+for doxy_hack in kcontrol/kresources ; do
+pushd %{buildroot}%{_kde4_docdir}/HTML/en/${doxy_hack}
+bunzip2 index.cache.bz2
+sed -i -e 's!<a name="id[0-9]*"></a>!!g' index.cache
+bzip2 -9 index.cache
+done
+popd
+
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
 pushd %{buildroot}%{_kde4_libdir}
 for i in lib*.so
 do
   case "$i" in
-    libkdeinit4_*.so)
-      ;;
-    *)
+    libkabc.so | libkresources.so)
       linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
@@ -151,20 +153,16 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_libdir}/lib*.so.*
-%{_kde4_libdir}/kde4/*
-%exclude %{_kde4_libdir}/kde4/devel/
-%{_kde4_libdir}/gpgmepp/
-%{_kde4_docdir}/HTML/en/*
-%if 0%{?apidocs}
-%exclude %{_kde4_docdir}/HTML/en/kdepimlibs-apidocs/
-%endif
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_docdir}/HTML/en/kcontrol/
+%{_kde4_docdir}/HTML/en/kioslave/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
-
+%{_kde4_libdir}/lib*.so
 # CMake seems to change behaviour between F11's cmake (2.6.3rc5)
 # and F10's cmake (2.6.2) -- Lorenzo
 %if 0%{?fedora} > 10
@@ -183,6 +181,10 @@
 
 
 %changelog
+* Mon Feb 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- multilib conflicts (#485659)
+- kde4/devel symlinks: blacklist only known conflicts
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0
 - exclude kdepimlibs-apidocs from main pkg