packages: kde4-kdepim-runtime/kde4-kdepim-runtime.spec - merged from DEVEL
shadzik
shadzik at pld-linux.org
Thu Feb 18 16:25:47 CET 2010
Author: shadzik Date: Thu Feb 18 15:25:47 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/kde4-kdepim-runtime:
kde4-kdepim-runtime.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec
diff -u packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.12 packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.13
--- packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec:1.12 Thu Jan 28 23:51:09 2010
+++ packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec Thu Feb 18 16:25:42 2010
@@ -1,44 +1,45 @@
# $Revision$, $Date$
-%define _state stable
-%define qtver 4.5.3
+%define _state stable
+%define qtver 4.6.1
%define orgname kdepim-runtime
Summary: Runtime Personal Information Management (PIM) for KDE
Summary(pl.UTF-8): Zarządca informacji osobistej (PIM) dla KDE
Name: kde4-kdepim-runtime
-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: 36d13c587898a719247c3fa600a446df
-#Patch100: %{name}-branch.diff
+# Source0-md5: ff023837a749cceac1f83c291dbe2ff0
+Patch100: %{name}-branch.diff
URL: http://www.kde.org/
-BuildRequires: Qt3Support-devel
-BuildRequires: QtDesigner-devel
-BuildRequires: QtNetwork-devel
-BuildRequires: QtSql-devel
-BuildRequires: QtSvg-devel
-BuildRequires: QtTest-devel
-BuildRequires: QtWebKit-devel
-BuildRequires: akonadi-devel >= 1.1.2
+BuildRequires: Qt3Support-devel >= %{qtver}
+BuildRequires: QtDesigner-devel >= %{qtver}
+BuildRequires: QtNetwork-devel >= %{qtver}
+BuildRequires: QtSql-devel >= %{qtver}
+BuildRequires: QtSvg-devel >= %{qtver}
+BuildRequires: QtTest-devel >= %{qtver}
+BuildRequires: QtWebKit-devel >= %{qtver}
+BuildRequires: akonadi-devel >= 1.2.80
BuildRequires: automoc4 >= 0.9.88
BuildRequires: boost-devel >= 1.35.0
-BuildRequires: cmake >= 2.6.3
+BuildRequires: cmake >= 2.8.0
BuildRequires: kde4-kdebase-workspace-devel >= %{version}
BuildRequires: kde4-kdelibs-devel >= %{version}
-BuildRequires: kde4-kdelibs-experimental-devel >= %{version}
BuildRequires: kde4-kdepimlibs-devel >= %{version}
BuildRequires: libxml2-devel
BuildRequires: libxslt-progs
BuildRequires: pilot-link-devel >= 0.12.1
BuildRequires: qca-devel >= 2.0.0
-BuildRequires: qt4-build
+BuildRequires: qt4-build >= %{qtver}
+BuildRequires: qt4-qmake >= %{qtver}
BuildRequires: rpmbuild(macros) >= 1.129
-BuildRequires: soprano-devel >= 2.3.0
-BuildRequires: strigi-devel >= 0.6.5
+BuildRequires: soprano-devel >= 2.3.70
+BuildRequires: shared-desktop-ontologies-devel >= 0.2
+BuildRequires: strigi-devel >= 0.7.0
BuildRequires: zlib-devel
BuildConflicts: indexlib
BuildConflicts: kdepim-kontact-libs
@@ -69,9 +70,26 @@
%description kontact -l pl.UTF-8
Kontact Personal Information Management.
+%package devel
+Summary: Development files for KDE pim-runtime
+Summary(pl.UTF-8): Pliki nagłówkowe do KDE pim
+Summary(ru.UTF-8): Файлы разработки для kdepim
+Summary(uk.UTF-8): Файли розробки для kdepim
+Group: X11/Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kde4-kdelibs-devel >= %{version}
+
+%description devel
+This package contains header files needed if you wish to build
+applications based on kdepimruntime.
+
+%description devel -l pl.UTF-8
+Pakiet ten zawiera pliki nagłówkowe potrzebne do budowy aplikacji
+bazujących na kdepim-runtime.
+
%prep
%setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p1
%build
install -d build
@@ -91,8 +109,8 @@
rm -rf $RPM_BUILD_ROOT
%{__make} -C build/ install \
- DESTDIR=$RPM_BUILD_ROOT \
- kde_htmldir=%{_kdedocdir}
+ DESTDIR=$RPM_BUILD_ROOT \
+ kde_htmldir=%{_kdedocdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -102,38 +120,42 @@
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/akonadi_distlist_resource
+%attr(755,root,root) %{_bindir}/akonadi_contacts_resource
+#%attr(755,root,root) %{_bindir}/akonadi_distlist_resource
%attr(755,root,root) %{_bindir}/akonadi_ical_resource
%attr(755,root,root) %{_bindir}/akonadi_kabc_resource
%attr(755,root,root) %{_bindir}/akonadi_kcal_resource
%attr(755,root,root) %{_bindir}/akonadi_knut_resource
%attr(755,root,root) %{_bindir}/akonadi_localbookmarks_resource
%attr(755,root,root) %{_bindir}/akonadi_maildir_resource
+%attr(755,root,root) %{_bindir}/akonadi_maildispatcher_agent
+%attr(755,root,root) %{_bindir}/akonadi_mailtransport_dummy_resource
+%attr(755,root,root) %{_bindir}/akonadi_mbox_resource
+%attr(755,root,root) %{_bindir}/akonadi_nepomuk_calendar_feeder
+%attr(755,root,root) %{_bindir}/akonadi_nepomuk_contact_feeder
%attr(755,root,root) %{_bindir}/akonadi_nepomuktag_resource
%attr(755,root,root) %{_bindir}/akonadi_nntp_resource
-%attr(755,root,root) %{_bindir}/akonadi_strigi_feeder
+%attr(755,root,root) %{_bindir}/akonadi_notes_resource
%attr(755,root,root) %{_bindir}/akonadi_vcard_resource
%attr(755,root,root) %{_bindir}/akonadi_vcarddir_resource
-%attr(755,root,root) %{_bindir}/akonadiconsole
+%attr(755,root,root) %{_bindir}/akonadi_pop3_resource
%attr(755,root,root) %{_bindir}/akonaditray
%attr(755,root,root) %{_bindir}/akonadi2xml
%attr(755,root,root) %{_bindir}/akonadi_birthdays_resource
%attr(755,root,root) %{_bindir}/akonadi_imap_resource
%attr(755,root,root) %{_bindir}/akonadi_kolabproxy_resource
%attr(755,root,root) %{_bindir}/akonadi_microblog_resource
+%attr(755,root,root) %{_bindir}/kaddressbookmigrator
+%attr(755,root,root) %{_bindir}/kmail-migrator
%attr(755,root,root) %{_bindir}/kres-migrator
-%attr(755,root,root) %ghost %{_libdir}/libakonadi-kabccommon.so.?
-%attr(755,root,root) %{_libdir}/libakonadi-kabccommon.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libakonadi-kcal.so.?
-%attr(755,root,root) %{_libdir}/libakonadi-kcal.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libakonadi-xml.so.?
%attr(755,root,root) %{_libdir}/libakonadi-xml.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libakonadi_next.so.?
-%attr(755,root,root) %{_libdir}/libakonadi_next.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkdepim-copy.so.?
%attr(755,root,root) %{_libdir}/libkdepim-copy.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmaildir.so.?
%attr(755,root,root) %{_libdir}/libmaildir.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmbox.so.?
+%attr(755,root,root) %{_libdir}/libmbox.so.*.*.*
%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_addressee.so
%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_contactgroup.so
%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_mail.so
@@ -146,6 +168,7 @@
%attr(755,root,root) %{_libdir}/kde4/kcm_akonadi.so
%attr(755,root,root) %{_libdir}/kde4/kcm_akonadi_server.so
%attr(755,root,root) %{_libdir}/kde4/kcal_akonadi.so
+%{_datadir}/autostart/kaddressbookmigrator.desktop
%dir %{_datadir}/apps/akonadi
%{_datadir}/apps/akonadi/akonadi-xml.xsd
%dir %{_datadir}/apps/akonadi_knut_resource
@@ -160,8 +183,13 @@
%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
%dir %{_datadir}/akonadi
%dir %{_datadir}/akonadi/agents
-%{_datadir}/akonadi/agents/distlistresource.desktop
-%{_datadir}/akonadi/agents/strigifeeder.desktop
+%{_datadir}/akonadi/agents/contactsresource.desktop
+#%{_datadir}/akonadi/agents/distlistresource.desktop
+%{_datadir}/akonadi/agents/maildispatcheragent.desktop
+%{_datadir}/akonadi/agents/mboxresource.desktop
+%{_datadir}/akonadi/agents/mtdummyresource.desktop
+%{_datadir}/akonadi/agents/nepomukcalendarfeeder.desktop
+#%{_datadir}/akonadi/agents/strigifeeder.desktop
%{_datadir}/akonadi/agents/vcardresource.desktop
%{_datadir}/akonadi/agents/nntpresource.desktop
%{_datadir}/akonadi/agents/kcalresource.desktop
@@ -170,7 +198,10 @@
%{_datadir}/akonadi/agents/kabcresource.desktop
%{_datadir}/akonadi/agents/localbookmarksresource.desktop
%{_datadir}/akonadi/agents/maildirresource.desktop
+%{_datadir}/akonadi/agents/nepomukcontactfeeder.desktop
+#%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
%{_datadir}/akonadi/agents/nepomuktagresource.desktop
+%{_datadir}/akonadi/agents/pop3resource.desktop
%{_datadir}/akonadi/agents/vcarddirresource.desktop
%{_datadir}/akonadi/agents/birthdaysresource.desktop
%{_datadir}/akonadi/agents/imapresource.desktop
@@ -181,20 +212,24 @@
%{_datadir}/apps/akonadi/firstrun/defaultaddressbook
%{_datadir}/apps/akonadi/firstrun/defaultcalendar
%{_datadir}/kde4/services/akonadi.protocol
-%{_desktopdir}/kde4/akonadiconsole.desktop
-%dir %{_datadir}/apps/akonadiconsole
-%{_datadir}/apps/akonadiconsole/akonadiconsoleui.rc
%{_datadir}/kde4/services/kcm_akonadi_resources.desktop
%{_datadir}/kde4/services/kcm_akonadi.desktop
%{_datadir}/kde4/services/kcm_akonadi_server.desktop
%{_desktopdir}/kde4/akonaditray.desktop
%{_datadir}/kde4/services/kresources/kcal/akonadi.desktop
%{_datadir}/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+%{_datadir}/config/kmail-migratorrc
%{_datadir}/config/kres-migratorrc
%{_datadir}/kde4/services/kresources/kabc/akonadi.desktop
%{_datadir}/mime/packages/kdepim-mime.xml
%{_iconsdir}/*/*/apps/kolab.png
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libakonadi-xml.so
+%attr(755,root,root) %{_libdir}/libkdepim-copy.so
+%attr(755,root,root) %{_libdir}/libmaildir.so
+%attr(755,root,root) %{_libdir}/libmbox.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -202,18 +237,61 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.12 2010/01/28 22:51:09 shadzik
-- 4.3.5
+Revision 1.13 2010/02/18 15:25:42 shadzik
+- merged from DEVEL
+
+Revision 1.8.2.17 2010/02/17 20:32:32 arekm
+- rel 3; branch diff updated
+
+Revision 1.8.2.16 2010/02/12 07:59:35 arekm
+- rel 2; branch diff
+
+Revision 1.8.2.15 2010/02/04 20:43:23 arekm
+- up to 4.4.0
+
+Revision 1.8.2.14 2010/02/02 20:56:08 shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.8.2.13 2010/02/02 16:01:09 shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.8.2.12 2010/02/02 15:50:38 shadzik
+- version qt4 BRs
+- add qt4-qmake BR
+
+Revision 1.8.2.11 2010/02/02 13:12:24 shadzik
+- force cmake 2.8.0 BR
-Revision 1.11 2009/12/03 23:28:33 sparky
-- BR: Qt3Support-devel, QtNetwork-devel, QtSql-devel, QtSvg-devel,
- QtTest-devel, QtWebKit-devel, libxml2-devel, libxslt-progs, qt4-build
+Revision 1.8.2.10 2010/02/01 02:09:00 shadzik
+- 4.4 RC3
-Revision 1.10 2009/11/28 20:48:29 shadzik
-- 4.3.4
+Revision 1.8.2.9 2010/01/20 10:05:12 arekm
+- up to 4.3.95
-Revision 1.9 2009/10/31 14:28:12 shadzik
-- 4.3.3
+Revision 1.8.2.8 2010/01/08 21:08:57 zawadaa
+- up to 4.3.90
+
+Revision 1.8.2.7 2009/12/24 02:00:04 shadzik
+- 4.4 Beta2
+
+Revision 1.8.2.6 2009/12/05 01:30:15 shadzik
+- 4.4 beta1
+
+Revision 1.8.2.5 2009/12/03 23:30:42 sparky
+- BR: Qt3Support-devel, QtNetwork-devel, QtSql-devel, QtSvg-devel, QtTest-devel,
+ QtWebKit-devel, libxml2-devel, libxslt-progs, qt4-build
+
+Revision 1.8.2.4 2009/10/29 13:50:11 paszczus
+- updated to 4.3.73
+
+Revision 1.8.2.3 2009/10/19 05:36:30 paszczus
+- added devel subpackage
+
+Revision 1.8.2.2 2009/10/18 18:30:22 paszczus
+- updated to 4.3.72
+
+Revision 1.8.2.1 2009/10/09 12:08:43 paszczus
+- updated to 4.3.69
Revision 1.8 2009/10/03 11:59:48 shadzik
- updated qt BR
@@ -240,4 +318,3 @@
Revision 1.1 2009/08/04 17:38:41 shadzik
- init
- raw from kde4-kdepim (akonadi section)
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim-runtime/kde4-kdepim-runtime.spec?r1=1.12&r2=1.13&f=u
More information about the pld-cvs-commit
mailing list