rpms/kdepimlibs/F-13 kdepimlibs.spec,1.128,1.129

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7382

Modified Files:
	kdepimlibs.spec 
Log Message:
* Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-2
- kdepimlibs pulling in kdepimlibs-akonadi (#608863)



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-13/kdepimlibs.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- kdepimlibs.spec	30 May 2010 15:42:54 -0000	1.128
+++ kdepimlibs.spec	28 Jun 2010 20:10:12 -0000	1.129
@@ -7,7 +7,7 @@
 
 Name: kdepimlibs
 Version: 4.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE PIM Libraries
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -153,6 +153,12 @@ cp -prf kdepimlibs-%{version}%{?alphatag
 
 %postun -p /sbin/ldconfig
 
+%if 0%{?akonadi_subpkg}
+%post akonadi -p /sbin/ldconfig
+
+%postun akonadi -p /sbin/ldconfig
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -161,8 +167,8 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kabc/
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_datadir}/config.kcfg/*
+%{_kde4_datadir}/config.kcfg/recentcontactscollections.kcfg
+%{_kde4_datadir}/config.kcfg/specialmailcollections.kcfg
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
@@ -170,16 +176,27 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_docdir}/HTML/en/kcontrol/
 %{_kde4_docdir}/HTML/en/kioslave/
-%{_kde4_appsdir}/akonadi/
 %{_kde4_appsdir}/libkholidays/
 %{_kde4_datadir}/mime/packages/kdepimlibs-mime.xml
+
 %if 0%{?akonadi_subpkg}
 %exclude %{_kde4_libdir}/libakonadi-*.so.*
+%exclude %{_kde4_libdir}/libmailtransport.so.4*
+%exclude %{_kde4_libdir}/kde4/kcm_mailtransport.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_mailtransport.desktop
+
 %files akonadi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libakonadi-*.so.*
 %endif
+%{_kde4_appsdir}/akonadi/
 %{_kde4_appsdir}/akonadi-kde/
+%{_kde4_libdir}/kde4/kcm_mailtransport.so
+%{_kde4_libdir}/libmailtransport.so.4*
+%{_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
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +215,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.org> 4.4.4-2
+- kdepimlibs pulling in kdepimlibs-akonadi (#608863)
+
 * Sun May 30 2010 Than Ngo <than at redhat.com> - 4.4.4-1
 - 4.4.4