rpms/kdepimlibs/F-9 kdepimlibs.spec,1.51,1.52

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7401/F-9

Modified Files:
	kdepimlibs.spec 
Log Message:
Sync from devel:

* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
- fix libkcal devel symlink hack

* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- -apidocs noarch (f10+)
- package %%_kde4_appsdir/akonadi-kde only once


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdepimlibs.spec	1 Apr 2009 20:24:10 -0000	1.51
+++ kdepimlibs.spec	6 Apr 2009 00:46:13 -0000	1.52
@@ -1,4 +1,4 @@
-#ifarch noarch
+
 %if 0%{?fedora} > 8
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1
@@ -7,16 +7,13 @@
 # files from KDE 4 in %{_kde4_docdir}/HTML/en/common due to conflicts with KDE 3
 %define apidocs 0
 %endif
-#else
-%define rest 1
-#endif
 
 %define akonadi_subpkg 1
 %define akonadi_version 1.1.1
 
 Name: kdepimlibs
 Version: 4.2.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -82,6 +79,9 @@
 Group: Development/Documentation
 Summary: kdepimlibs API documentation
 Requires: kde-filesystem
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 
 %description apidocs
 This package includes the kdepimlibs API documentation in HTML
@@ -98,9 +98,7 @@
 %{cmake_kde4} ..
 popd
 
-%if 0%{?rest}
 make %{?_smp_mflags} -C %{_target_platform}
-%endif
 
 # build apidocs
 %if 0%{?apidocs}
@@ -112,7 +110,6 @@
 %install
 rm -rf %{buildroot}
 
-%if 0%{?rest}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # hack around HTML doc multilib conflicts
@@ -138,6 +135,7 @@
       ;;
 # conflicts with kdepim3 (compat)
     libkcal.so)
+      linktarget=`readlink "$i"`
       rm -f "$i"
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
@@ -152,7 +150,6 @@
   esac
 done
 popd
-%endif
 
 # install apidocs
 %if 0%{?apidocs}
@@ -170,10 +167,8 @@
 rm -rf %{buildroot}
 
 
-%if 0%{?rest}
 %files
 %defattr(-,root,root,-)
-%{_kde4_appsdir}/akonadi-kde/
 %{_kde4_appsdir}/kabc/
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_datadir}/config.kcfg/*
@@ -205,7 +200,6 @@
 %{_kde4_libdir}/KdepimLibs*
 %endif
 %{_kde4_libdir}/gpgmepp/
-%endif
 
 %if 0%{?apidocs}
 %files apidocs
@@ -215,6 +209,13 @@
 
 
 %changelog
+* Mon Apr 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-3
+- fix libkcal devel symlink hack
+
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
+- -apidocs noarch (f10+)
+- package %%_kde4_appsdir/akonadi-kde only once
+
 * Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2