From 6ea2e9035b61d3170d527858e0f8a52f1ffc43a3 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Apr 15 2013 17:00:25 +0000
Subject: Update to 0.9.12 (#949286)


This update incorporates two packages that were distributed separatately
before: zeitgeist-datahub and libzeitgeist.

The latter has also gone through some API changes, and the library name
has changed from the standalone libzeitgeist-1.0 to libzeitgeist-2.0.
This ensures that the version bundled with zeitgeist and the separately
packaged libzeitgeist are parallel installable, making it possible to
keep the standalone libzeitgeist package around until all users have
been ported over.

The separate zeitgeist-datahub however needs to be retired.

(F19+ only, please don't cherry-pick it to earlier releases.)

---

diff --git a/.gitignore b/.gitignore
index ebf006a..f2f801b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ zeitgeist-0.5.0.tar.gz
 /zeitgeist-0.8.2.tar.gz
 /zeitgeist-0.9.0.tar.bz2
 /zeitgeist-0.9.5.tar.bz2
+/zeitgeist-0.9.12.tar.xz
diff --git a/sources b/sources
index 426d453..600eb4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5841e4624b07ba74866fb177f1c9aae7  zeitgeist-0.9.5.tar.bz2
+58488a7636a663a700be2b1d1a639e40  zeitgeist-0.9.12.tar.xz
diff --git a/zeitgeist.spec b/zeitgeist.spec
index 2cda46b..91ecb16 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,26 +1,29 @@
 Summary:	Framework providing Desktop activity awareness
 Name:		zeitgeist
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.12
+Release:	1%{?dist}
 License:	LGPLv2+
 URL:		https://launchpad.net/zeitgeist
-Source0:	http://launchpad.net/%{name}/0.9/0.9.5/+download/%{name}-%{version}.tar.bz2
+Source0:	http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz
 
 BuildRequires:	dbus-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	intltool
+BuildRequires:	json-glib-devel
 BuildRequires:	python-devel
 BuildRequires:	python-rdflib
 BuildRequires:	raptor2
 BuildRequires:	sqlite-devel
+BuildRequires:	telepathy-glib-devel
 BuildRequires:	vala
 BuildRequires:	xapian-core-devel
 Requires:	dbus
 Requires:	dbus-python
-Requires:	pygobject2
-Requires:	pyxdg
-Requires:	zeitgeist-datahub
+
+Obsoletes:	zeitgeist-datahub < 0.9.10
 
 %description
 Zeitgeist is a service which logs the users's activities and events (files
@@ -30,6 +33,24 @@ relevant information available to other applications.
 Note that this package only contains the daemon, which you can use
 together with several different user interfaces.
 
+
+%package	libs
+Summary:	Client library for interacting with the Zeitgeist daemon
+
+%description	libs
+Libzeitgeist is a client library for interacting with the Zeitgeist
+daemon.
+
+
+%package	devel
+Summary:	Development files for %{name}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+
+%description	devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
 
@@ -38,26 +59,59 @@ together with several different user interfaces.
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
 %build
-%configure
+%configure --enable-fts
 make %{?_smp_mflags} 
 
 %install
 make DESTDIR=%{buildroot} install
 
+rm -f %{buildroot}%{_libdir}/*.la
+
+# We install AUTHORS and NEWS with %%doc instead
+rm -rf %{buildroot}%{_datadir}/zeitgeist/doc
+
 #%find_lang %{name}
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 #%files -f %{name}.lang
 %files
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING COPYING.GPL NEWS
 %{_bindir}/zeitgeist-daemon
+%{_bindir}/zeitgeist-datahub
 %{_libexecdir}/zeitgeist-fts
 %{_datadir}/%{name}/
 %{python_sitelib}/zeitgeist/
 %{_datadir}/dbus-1/services/org.gnome.zeitgeist*.service
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/zeitgeist-daemon
 %{_mandir}/man1/zeitgeist-*.*
-%exclude %{_prefix}/doc/zeitgeist/
+%{_sysconfdir}/xdg/autostart/zeitgeist-datahub.desktop
+
+%files libs
+%doc COPYING
+%{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib
+%{_libdir}/libzeitgeist-2.0.so.*
+
+%files devel
+%{_includedir}/zeitgeist-2.0/
+%{_libdir}/libzeitgeist-2.0.so
+%{_libdir}/pkgconfig/zeitgeist-2.0.pc
+%{_datadir}/gir-1.0/Zeitgeist-2.0.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/zeitgeist-2.0.deps
+%{_datadir}/vala/vapi/zeitgeist-2.0.vapi
+%{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
 
 %changelog
+* Sun Apr 14 2013 Kalev Lember <kalevlember@gmail.com> - 0.9.12-1
+- Update to 0.9.12 (#949286)
+- Obsolete zeitgeist-datahub
+- Package up the libzeitgeist-2.0 library
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild