rpms/akonadi/F-10 .cvsignore, 1.7, 1.8 akonadi.spec, 1.20, 1.21 sources, 1.7, 1.8

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/akonadi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4703/F-10

Modified Files:
	.cvsignore akonadi.spec sources 
Log Message:
Akonadi 1.2.0, to go with KDE 4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 May 2009 02:57:35 -0000	1.7
+++ .cvsignore	30 Jul 2009 17:46:54 -0000	1.8
@@ -1 +1 @@
-akonadi-1.1.2.tar.bz2
+akonadi-1.2.0.tar.bz2


Index: akonadi.spec
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/akonadi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- akonadi.spec	3 May 2009 02:57:35 -0000	1.20
+++ akonadi.spec	30 Jul 2009 17:46:54 -0000	1.21
@@ -1,20 +1,20 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.1.2
+Version: 1.2.0
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
-Source0:  http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
+Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # shrink default initial db size a bit (approx 140mb->28mb)
 %define mysql_conf_timestamp 20090220
 Patch1: akonadi-1.1.1-mysql_conf.patch
 
-## upstream
+## upstream patches
 
 BuildRequires: cmake >= 2.6.0
 BuildRequires: qt4-devel >= 4.4
@@ -25,13 +25,13 @@ BuildRequires: mysql-server
 BuildRequires: libxslt
 BuildRequires: shared-mime-info
 BuildRequires: boost-devel
+BuildRequires: soprano-devel
 
 # when/if akonadi grows support for other backends, consider splitting
 # these similar to how phonon is done currently.
 Requires: qt4-mysql
 # not *strictly* required, but we need a functional default configuration
-Requires(hint): mysql-server
-
+Requires: mysql-server
 Requires(postun): /sbin/ldconfig
 
 %description
@@ -73,6 +73,7 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents
 
 touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf
@@ -104,20 +105,41 @@ fi
 %{_bindir}/akonadictl
 %{_bindir}/akonadiserver
 %{_libdir}/libakonadi*.so.1*
-%{_datadir}/dbus-1/interfaces/
-%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
+%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_datadir}/mime/packages/akonadi-mime.xml
-%dir %{_datadir}/akonadi
-%dir %{_datadir}/akonadi/agents
+%{_datadir}/akonadi/
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/akonadi/
 %{_libdir}/pkgconfig/akonadi.pc
 %{_libdir}/libakonadi*.so
+%{_libdir}/cmake/Akonadi/
 
 
 %changelog
+* Thu Jul 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 1.2.0-1
+- Akonadi 1.2.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.95-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 25 2009 Than Ngo <than at redhat.com> - 1.1.95-1
+- 1.1.95
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 1.1.90-1
+- akonadi-1.1.90
+
+* Tue May 26 2009 Rex Dieter <rdieter at fedoraproject.org> 1.1.85-3
+- akonadi.pc.cmake: s/AKONADI_LIB_VERSION_STRING/AKONADI_VERSION_STRING/
+
+* Tue May 12 2009 Than Ngo <than at redhat.com> 1.1.85-2
+- fix rpm file list
+
+* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.85-1
+- akonadi-1.1.85
+
 * Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.2-1
 - akonadi-1.1.2
 - optimize scriptlets a bit


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akonadi/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 May 2009 02:57:35 -0000	1.7
+++ sources	30 Jul 2009 17:46:54 -0000	1.8
@@ -1 +1 @@
-5651b02358f7d2f1c0954dfd31feafb1  akonadi-1.1.2.tar.bz2
+4b04ab0b4670e1133307f7b82af46ce1  akonadi-1.2.0.tar.bz2