Author: kkofler
Update of /cvs/pkgs/rpms/akonadi/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13586/F-8
Modified Files:
akonadi.spec
Log Message:
Sync from F-10:
* Mon Dec 01 2008 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.0.0-5
- own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
* Wed Oct 22 2008 Rex Dieter <rdieter(a)fedoraproject.org> 1.0.0-4
- drop Requires: mysql-server (for now), mention in %%description
(not building, just syncing)
Index: akonadi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akonadi/F-8/akonadi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- akonadi.spec 30 Jul 2008 19:14:30 -0000 1.3
+++ akonadi.spec 1 Dec 2008 00:09:34 -0000 1.4
@@ -1,7 +1,7 @@
Summary: PIM Storage Service
Name: akonadi
Version: 1.0.0
-Release: 3%{?dist}
+Release: 5%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
@@ -20,13 +20,21 @@
# when/if akonadi grows support for other backends, consider splitting
# these similar to how phonon is done currently.
-Requires: qt4-mysql mysql-server
+Requires: qt4-mysql
+# not *strictly* required, leave out for now, until we have something in
+# fedora that actively uses akonadi.
+#Requires(hint): mysql-server
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description
%{summary}.
+Requires an available instance of mysql server at runtime.
+Akonadi can spawn a per-user one automatically if the mysql-server
+package is installed on the machine.
+See also: %{_sysconfdir}/akonadi/mysql-global.conf
+
%package devel
Summary: Developer files for %{name}
@@ -37,9 +45,11 @@
%description devel
%{summary}.
+
%prep
%setup -q
+
%build
mkdir -p %{_target_platform}
@@ -51,13 +61,17 @@
make %{?_smp_mflags} -C %{_target_platform}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -66,6 +80,7 @@
/sbin/ldconfig
update-mime-database %{_datadir}/mime &> /dev/null || :
+
%files
%defattr(-,root,root,-)
%doc AUTHORS lgpl-license
@@ -78,6 +93,8 @@
%{_datadir}/dbus-1/interfaces/
%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
%{_datadir}/mime/packages/akonadi-mime.xml
+%dir %{_datadir}/akonadi
+%dir %{_datadir}/akonadi/agents
%files devel
%defattr(-,root,root,-)
@@ -85,13 +102,20 @@
%{_libdir}/pkgconfig/akonadi.pc
%{_libdir}/libakonadi*.so
+
%changelog
+* Mon Dec 01 2008 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.0.0-5
+- own /usr/share/akonadi and /usr/share/akonadi/agents (#473595)
+
+* Wed Oct 22 2008 Rex Dieter <rdieter(a)fedoraproject.org> 1.0.0-4
+- drop Requires: mysql-server (for now), mention in %%description
+
* Wed Jul 30 2008 Rex Dieter <rdieter(a)fedoraproject.org> 1.0.0-3
- Requires: mysql-server
* Wed Jul 30 2008 Rex Dieter <rdieter(a)fedoraproject.org> 1.0.0-2
- BR: mysql-server
-- Requires: qt-mysql
+- Requires: qt4-mysql
- cleanup spec
* Wed Jul 23 2008 Than Ngo <than(a)redhat.com> - 1.0.0-1
