[kdepimlibs] 4.9.90 (4.10beta2)

[Rex Dieter]

commit ea23f1909112df83ab7009820b8cf2235e44ed9f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 3 11:41:27 2012 -0600

    4.9.90 (4.10beta2)

 ...o-html-image-when-image-has-specific-size.patch |   32 -----
 ...ic-fallback-for-SSL-TLS-protocol-versions.patch |  139 --------------------
 ...accept-richtext-it-stores-data-as-plainte.patch |   24 ----
 ...-Fix-error-reporting-by-Albert-Astals-Cid.patch |   55 --------
 ...online-offline-setting-requested-by-a-cli.patch |  130 ------------------
 kdepimlibs.spec                                    |   39 +++---
 6 files changed, 21 insertions(+), 398 deletions(-)
---
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index 815c703..bd03200 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -1,12 +1,12 @@
 %define apidocs 1
 %define akonadi_subpkg 1
-%define akonadi_version_min 1.8.0
+%define akonadi_version_min 1.8.51
 
 %global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
 
 Name: kdepimlibs
 Summary: KDE PIM Libraries
-Version: 4.9.4
+Version: 4.9.90
 Release: 1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -21,12 +21,6 @@ URL: http://www.kde.org/
 Source0: http://download.kde.org/%{stable}/%{version}/src/kdepimlibs-%{version}.tar.xz
 
 ## upstream patches
-# cherry-pick a few upstream commits since 4.9.3
-Patch101: 0001-Fix-reply-to-html-image-when-image-has-specific-size.patch
-Patch103: 0003-automatic-fallback-for-SSL-TLS-protocol-versions.patch
-Patch104: 0004-Note-don-t-accept-richtext-it-stores-data-as-plainte.patch
-Patch105: 0005-Fix-error-reporting-by-Albert-Astals-Cid.patch
-Patch107: 0007-Honour-the-online-offline-setting-requested-by-a-cli.patch
 
 Requires: %{name}-kxmlrpcclient%{?_isa} = %{version}-%{release}
 %if ! 0%{?akonadi_subpkg}
@@ -105,12 +99,6 @@ quite easy to use.
 %prep
 %setup -q
 
-%patch101 -p1 -b .0001
-%patch103 -p1 -b .0003
-%patch104 -p1 -b .0004
-%patch105 -p1 -b .0005
-%patch107 -p1 -b .0007
-
 
 %build
 mkdir -p %{_target_platform}
@@ -170,9 +158,6 @@ cp -prf kdepimlibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HT
 find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 
 %post -p /sbin/ldconfig
 
@@ -242,10 +227,20 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 %exclude %{_kde4_datadir}/kde4/services/akonadicontact_actions.desktop
 
 %post akonadi -p /sbin/ldconfig
-%postun akonadi -p /sbin/ldconfig
+
+%postun akonadi
+/sbin/ldconfig ||:
+if [ $1 -eq 0 ] ; then
+update-mime-database %{_kde4_datadir}/mime &> /dev/null
+fi
+
+%posttrans akonadi
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
 
 %files akonadi
 %endif
+%{_kde4_bindir}/akonadi_benchmarker
+%{_kde4_bindir}/akonaditest
 %{_kde4_libdir}/libakonadi-calendar.so.4*
 %{_kde4_libdir}/libakonadi-contact.so.4*
 %{_kde4_libdir}/libakonadi-kabc.so.4*
@@ -253,22 +248,27 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 %{_kde4_libdir}/libakonadi-kde.so.4*
 %{_kde4_libdir}/libakonadi-kmime.so.4*
 %{_kde4_libdir}/libakonadi-notes.so.4*
+%{_kde4_libdir}/libakonadi-socialutils.so.4*
 %{_kde4_appsdir}/akonadi/
 %{_kde4_appsdir}/akonadi-kde/
 %{_kde4_libdir}/libkalarmcal.so.2*
 %{_kde4_libdir}/libmailtransport.so.4*
+%{_kde4_libdir}/kde4/akonadi_serializer_socialfeeditem.so
 %{_kde4_libdir}/kde4/kcm_mailtransport.so
 %{_kde4_libdir}/kde4/kcm_akonadicontact_actions.so
 %{_kde4_datadir}/config.kcfg/mailtransport.kcfg
 %{_kde4_appsdir}/kconf_update/mailtransports.upd
 %{_kde4_appsdir}/kconf_update/migrate-transports.pl
 %{_kde4_datadir}/kde4/services/kcm_mailtransport.desktop
+%{_kde4_datadir}/mime/packages/x-vnd.akonadi.socialfeeditem.xml
 
 %files devel
 %{_kde4_appsdir}/cmake/modules/*
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/lib*.so
+# double-check is this really should be packaged or not -- rex
+%{_kde4_libdir}/libkimaptest.a
 %{_kde4_libdir}/cmake/KdepimLibs*
 %{_kde4_libdir}/gpgmepp/
 
@@ -286,6 +286,9 @@ update-mime-database %{_kde4_datadir}/mime >& /dev/null
 
 
 %changelog
+* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
+- 4.9.90 (4.10beta2)
+
 * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
 - 4.9.4