X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzeitgeist.git;a=blobdiff_plain;f=zeitgeist.spec;h=2d200c413a13519280ebbe26b01bc4af569c4a50;hp=a4a5fba76a4f4debe8849cd9a96d5083820d64ef;hb=5415db6;hpb=273a0deb8e09987b033f77e8a70645fd1e9cb584

diff --git a/zeitgeist.spec b/zeitgeist.spec
index a4a5fba..2d200c4 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,19 +1,21 @@
 Summary:	Framework providing Desktop activity awareness
 Summary(pl.UTF-8):	Szkielet zapewniający świadomość aktywności w środowisku graficznym
 Name:		zeitgeist
-Version:	0.9.14
-Release:	2
+Version:	0.9.16
+Release:	3
 License:	LGPL v2.1+
 Group:		Daemons
 Source0:	http://launchpad.net/zeitgeist/0.9/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5:	92371b864515389ffe7d70569f0bc9ed
+# Source0-md5:	f56b58a19d5fd5a7365ddcbe26ee6b15
 Patch0:		%{name}-lt.patch
+Patch1:		%{name}-vala.patch
 URL:		http://launchpad.net/zeitgeist
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.11
+BuildRequires:	dbus-devel
 BuildRequires:	dee-devel >= 1.0.2
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.26.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.36.0
 BuildRequires:	gnome-common
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gtk+3-devel >= 3.0.0
@@ -23,9 +25,10 @@ BuildRequires:	libraptor2-rapper
 BuildRequires:	python >= 1:2.6
 BuildRequires:	python-rdflib >= 3.0.0
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.673
 BuildRequires:	sqlite3-devel >= 3.7.11
 BuildRequires:	telepathy-glib-devel >= 0.18.0
-BuildRequires:	vala >= 2:0.18.0
+BuildRequires:	vala >= 2:0.22.0
 BuildRequires:	vala-telepathy-glib >= 0.18.0
 BuildRequires:	xapian-core-devel
 Requires:	%{name}-libs = %{version}-%{release}
@@ -52,7 +55,7 @@ i wzorce użycia.
 Summary:	Zeitgeist library
 Summary(pl.UTF-8):	Biblioteka Zeitgeist
 Group:		Libraries
-Requires:	glib2 >= 1:2.26.0
+Requires:	glib2 >= 1:2.36.0
 Requires:	sqlite3 >= 3.7.11
 
 %description libs
@@ -66,7 +69,7 @@ Summary:	Development files for Zeitgeist library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki Zeitgeist
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.26.0
+Requires:	glib2-devel >= 1:2.36.0
 
 %description devel
 This package provides development files for Zeitgeist library.
@@ -94,6 +97,9 @@ Summary(pl.UTF-8):	API Zeitgeist dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	vala >= 2:0.18.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n vala-zeitgeist
 Zeitgeist API for Vala language.
@@ -105,7 +111,10 @@ API Zeitgeist dla języka Vala.
 Summary:	bash-completion for Zeitgeist
 Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla Zeitgeist
 Group:		Applications/Shells
-Requires:	bash-completion
+Requires:	bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n bash-completion-zeitgeist
 This package provides bash-completion for Zeitgeist.
@@ -116,15 +125,18 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	--disable-fts \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--enable-fts
 %{__make}
 
 %install
@@ -148,8 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/zeitgeist-daemon
 %attr(755,root,root) %{_bindir}/zeitgeist-datahub
 /etc/xdg/autostart/zeitgeist-datahub.desktop
+%attr(755,root,root) %{_libdir}/zeitgeist-fts
+%{_datadir}/dbus-1/services/org.gnome.zeitgeist.fts.service
 %{_datadir}/dbus-1/services/org.gnome.zeitgeist.service
-%dir %{_datadir}/zeitgeist
 %{_mandir}/man1/zeitgeist-daemon.1*
 %{_mandir}/man1/zeitgeist-datahub.1*
 
@@ -158,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libzeitgeist-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzeitgeist-2.0.so.0
 %{_libdir}/girepository-1.0/Zeitgeist-2.0.typelib
+%dir %{_datadir}/zeitgeist
 
 %files devel
 %defattr(644,root,root,755)
@@ -179,4 +193,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-zeitgeist
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/zeitgeist-daemon
+%{bash_compdir}/zeitgeist-daemon