Author: shadzik Date: Wed Feb 17 23:18:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/kde4-kdepimlibs: kde4-kdepimlibs.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: packages/kde4-kdepimlibs/kde4-kdepimlibs.spec diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.103 packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.104 --- packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.103 Thu Jan 28 22:21:57 2010 +++ packages/kde4-kdepimlibs/kde4-kdepimlibs.spec Thu Feb 18 00:18:37 2010 @@ -2,21 +2,20 @@ # # Conditional build: # -%define qtver 4.5.3 +%define qtver 4.6.1 %define _state stable %define orgname kdepimlibs -%define svn 979380 Summary: Personal Information Management (PIM) libraries for KDE Summary(pl.UTF-8): Biblioteki zarządzania informacjami osobistymi (PIM) dla KDE Name: kde4-kdepimlibs -Version: 4.3.5 -Release: 1 +Version: 4.4.0 +Release: 3 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: bac3b6c50fc75408b39b401a6f2e6064 -Patch100: %{name}-branch.diff +# Source0-md5: 2eb04e5ae39a25009f036ec333eb118a +Patch100: %{name}-branch.diff BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtDBus-devel >= %{qtver} @@ -24,11 +23,11 @@ BuildRequires: QtSvg-devel >= %{qtver} BuildRequires: QtTest-devel >= %{qtver} BuildRequires: QtXml-devel >= %{qtver} -BuildRequires: akonadi-devel >= 1.1.95 +BuildRequires: akonadi-devel >= 1.3.1 BuildRequires: automoc4 >= 0.9.88 BuildRequires: bison BuildRequires: boost-devel >= 1.35.0 -BuildRequires: cmake >= 2.6.3 +BuildRequires: cmake >= 2.8.0 BuildRequires: cyrus-sasl-devel BuildRequires: flex BuildRequires: gpgme-devel >= 1:1.2.0 @@ -76,7 +75,7 @@ %prep %setup -q -n %{orgname}-%{version} -#%patch100 -p0 +%patch100 -p0 %build install -d build @@ -108,6 +107,8 @@ %files %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libakonadi-kcal.so.4.*.* +%attr(755,root,root) %ghost %{_libdir}/libakonadi-kcal.so.4 %attr(755,root,root) %{_libdir}/libkabc.so.4.*.* %attr(755,root,root) %ghost %{_libdir}/libkabc.so.4 %attr(755,root,root) %{_libdir}/libkabc_file_core.so.4.*.* @@ -116,6 +117,8 @@ %attr(755,root,root) %ghost %{_libdir}/libkcal.so.4 %attr(755,root,root) %{_libdir}/libkldap.so.4.*.* %attr(755,root,root) %ghost %{_libdir}/libkldap.so.4 +%attr(755,root,root) %{_libdir}/libkontactinterface.so.4.*.* +%attr(755,root,root) %ghost %{_libdir}/libkontactinterface.so.4 %attr(755,root,root) %{_libdir}/libkresources.so.4.*.* %attr(755,root,root) %ghost %{_libdir}/libkresources.so.4 %attr(755,root,root) %{_libdir}/libktnef.so.4.*.* @@ -144,6 +147,8 @@ %attr(755,root,root) %ghost %{_libdir}/libgpgme++-pth.so.2 %attr(755,root,root) %ghost %{_libdir}/libsyndication.so.4 %attr(755,root,root) %{_libdir}/libsyndication.so.4.*.* +%attr(755,root,root) %ghost %{_libdir}/libakonadi-contact.so.4 +%attr(755,root,root) %{_libdir}/libakonadi-contact.so.4.*.* %attr(755,root,root) %ghost %{_libdir}/libakonadi-kde.so.4 %attr(755,root,root) %{_libdir}/libakonadi-kde.so.4.*.* %attr(755,root,root) %ghost %{_libdir}/libakonadi-kmime.so.4 @@ -164,6 +169,7 @@ %attr(755,root,root) %{_libdir}/kde4/kabcformat_binary.so %attr(755,root,root) %{_libdir}/kde4/kcal_local.so %attr(755,root,root) %{_libdir}/kde4/kcal_localdir.so +%attr(755,root,root) %{_libdir}/kde4/kcm_akonadicontact_actions.so %attr(755,root,root) %{_libdir}/kde4/kcm_kresources.so %attr(755,root,root) %{_libdir}/kde4/kcm_mailtransport.so %attr(755,root,root) %{_libdir}/kde4/kio_imap4.so @@ -178,6 +184,8 @@ %{_datadir}/apps/kabc/*countrytransl.map %dir %{_datadir}/apps/kabc/formats %{_datadir}/apps/kabc/formats/*binary.desktop +%dir %{_datadir}/apps/akonadi +%{_datadir}/apps/akonadi/contact %dir %{_datadir}/apps/akonadi-kde %{_datadir}/apps/akonadi-kde/kcfg2dbus.xsl @@ -186,6 +194,8 @@ %{_datadir}/apps/libkholidays %{_datadir}/config.kcfg/mailtransport.kcfg +%{_datadir}/config.kcfg/recentcontactscollections.kcfg +%{_datadir}/config.kcfg/specialmailcollections.kcfg %{_datadir}/dbus-1/interfaces/org.kde.KResourcesManager.xml %{_datadir}/dbus-1/interfaces/org.kde.pim.IdentityManager.xml @@ -203,6 +213,7 @@ %{_datadir}/kde4/services/smtp.protocol %{_datadir}/kde4/services/smtps.protocol +%{_datadir}/kde4/services/akonadicontact_actions.desktop %{_datadir}/kde4/services/kcm_mailtransport.desktop %{_datadir}/kde4/services/kresources.desktop %dir %{_datadir}/kde4/services/kresources @@ -217,14 +228,19 @@ %{_datadir}/kde4/services/kresources/kcal/localdir.desktop %{_datadir}/kde4/services/kresources/kcal_manager.desktop +%{_datadir}/kde4/servicetypes/kontactplugin.desktop %{_datadir}/kde4/servicetypes/kresources_manager.desktop %{_datadir}/kde4/servicetypes/kresources_plugin.desktop %lang(en) %{_kdedocdir}/en/kcontrol/kresources %lang(en) %{_kdedocdir}/en/kioslave/imap %lang(en) %{_kdedocdir}/en/kioslave/ldap +%lang(en) %{_kdedocdir}/en/kioslave/mbox %lang(en) %{_kdedocdir}/en/kioslave/nntp %lang(en) %{_kdedocdir}/en/kioslave/pop3 +%lang(en) %{_kdedocdir}/en/kioslave/sieve %lang(en) %{_kdedocdir}/en/kioslave/smtp +%lang(en) %{_kdedocdir}/en/kioslave/mbox +%lang(en) %{_kdedocdir}/en/kioslave/sieve %{_datadir}/mime/packages/kdepimlibs-mime.xml @@ -236,16 +252,22 @@ %{_includedir}/KDE/KBlog %{_includedir}/KDE/KCal %{_includedir}/KDE/KHolidays +%{_includedir}/KDE/KIMAP +%{_includedir}/KDE/KontactInterface %{_includedir}/KDE/KLDAP +%{_includedir}/KDE/KMime %{_includedir}/KDE/KPIMIdentities %{_includedir}/KDE/KPIMTextEdit %{_includedir}/KDE/KPIMUtils %{_includedir}/KDE/KResources +%{_includedir}/KDE/KTNEF +%{_includedir}/KDE/Mailtransport %{_includedir}/KDE/Syndication %{_includedir}/akonadi %{_includedir}/kabc %{_includedir}/kcal %{_includedir}/kholidays +%{_includedir}/kontactinterface %{_includedir}/kldap %{_includedir}/kresources %{_includedir}/ktnef @@ -274,44 +296,96 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.103 2010/01/28 21:21:57 shadzik -- 4.3.5 +Revision 1.104 2010/02/17 23:18:37 shadzik +- merged from DEVEL -Revision 1.102 2009/12/15 19:15:32 arekm -- rel 3; upstream nntp fix +Revision 1.90.2.29 2010/02/12 07:34:32 arekm +- rel 3; branch diff updated -Revision 1.101 2009/12/11 22:54:37 arekm -- rel 2; don't overflow when doing XOVER (causes network job hang), bug 218253 +Revision 1.90.2.28 2010/02/09 17:24:45 shadzik +- update akonadi BR -Revision 1.100 2009/12/03 19:39:49 sparky -- BR: openldap-devel +Revision 1.90.2.27 2010/02/08 21:21:52 arekm +- rel 2; double and quoting -Revision 1.99 2009/11/28 17:15:09 shadzik -- 4.3.4 +Revision 1.90.2.26 2010/02/04 19:31:15 arekm +- up to 4.4.0 -Revision 1.98 2009/11/25 09:57:47 arekm -- rel 2; branch diff updated +Revision 1.90.2.25 2010/02/02 20:56:00 shadzik +- bump up qtver; it's not necessary but we make sure we link with the latest qtver -Revision 1.97 2009/11/22 00:07:00 sparky -- %{_libdir}/cmake dir does not belong here +Revision 1.90.2.24 2010/02/02 16:00:58 shadzik +- minor clean up (removing old svn snap stuff) -Revision 1.96 2009/10/31 13:06:14 shadzik -- 4.3.3 +Revision 1.90.2.23 2010/02/02 13:12:12 shadzik +- force cmake 2.8.0 BR -Revision 1.95 2009/10/03 11:59:42 shadzik -- updated qt BR +Revision 1.90.2.22 2010/02/02 12:50:32 shadzik +- lose ownership of %{_libdir}/cmake -Revision 1.94 2009/10/02 17:35:47 shadzik -- 4.3.2 try #1 +Revision 1.90.2.21 2010/02/02 12:49:22 shadzik +- BR: openldap-devel introduced on HEAD by sparky -Revision 1.93 2009/08/28 13:32:04 shadzik -- 4.3.1 +Revision 1.90.2.20 2010/01/31 23:24:17 shadzik +- 4.4 RC3 -Revision 1.92 2009/08/25 20:27:31 shadzik -- rel 4 +Revision 1.90.2.19 2010/01/20 08:07:53 arekm +- up to 4.3.95 -Revision 1.91 2009/08/25 20:13:22 shadzik -- apidocs no more (remainings from kde3) +Revision 1.90.2.18 2010/01/08 03:37:41 shadzik +- 4.4 RC1 + +Revision 1.90.2.17 2009/12/20 12:56:14 shadzik +- 4.4 Beta2 + +Revision 1.90.2.16 2009/12/04 01:22:00 shadzik +- rel 2 + +Revision 1.90.2.15 2009/12/03 20:40:07 shadzik +- updated BRs + +Revision 1.90.2.14 2009/12/01 19:49:30 shadzik +- 4.4 beta1 + +Revision 1.90.2.13 2009/11/28 18:52:06 shadzik +- 4.3.77 + +Revision 1.90.2.12 2009/11/17 18:12:36 cactus +- up to 4.3.75 + +Revision 1.90.2.11 2009/11/14 16:37:09 cactus +- up to 4.3.74 + +Revision 1.90.2.10 2009/10/28 21:43:55 shadzik +- 4.3.73 + +Revision 1.90.2.9 2009/10/20 01:13:45 shadzik +- ciekawe k**wa jak upgradowaliscie kde bez tego katalogu!? + +Revision 1.90.2.8 2009/10/18 13:07:35 paszczus +- updated to 4.3.72 + +Revision 1.90.2.7 2009/10/08 06:10:49 paszczus +- proper md5 + +Revision 1.90.2.6 2009/10/01 23:27:18 cactus +- up to 4.3.69 + +Revision 1.90.2.5 2009/09/23 00:00:24 cactus +- merged some changes from HEAD + +Revision 1.90.2.4 2009/09/22 11:59:07 cactus +- up to 4.3.68 + +Revision 1.90.2.3 2009/09/11 00:39:03 cactus +- up to 4.3.67 + +Revision 1.90.2.2 2009/08/25 09:42:44 paszczus +- updated to 4.3.65 +- updated akonadi BR: 1.2.60 + +Revision 1.90.2.1 2009/08/19 23:37:34 cactus +- up to 4.3.64 Revision 1.90 2009/08/19 19:51:19 arekm - rel 3; branch diff is back ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.103&r2=1.104&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
