X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzeitgeist.git;a=blobdiff_plain;f=zeitgeist.spec;h=fa9258a235bccf64008270fea9f561b4fa0460a7;hp=fd01d33e8f63fd35654f4166337146fc11531c7a;hb=ade8250;hpb=2264f342374b90bf8a0da1bd6ddb5ae25c54efaf

diff --git a/zeitgeist.spec b/zeitgeist.spec
index fd01d33..fa9258a 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,18 +1,19 @@
 Summary:	Framework providing Desktop activity awareness
 Summary(pl.UTF-8):	Szkielet zapewniający świadomość aktywności w środowisku graficznym
 Name:		zeitgeist
-Version:	0.9.12
-Release:	1
+Version:	0.9.14
+Release:	6
 License:	LGPL v2.1+
 Group:		Daemons
 Source0:	http://launchpad.net/zeitgeist/0.9/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5:	58488a7636a663a700be2b1d1a639e40
+# Source0-md5:	92371b864515389ffe7d70569f0bc9ed
 Patch0:		%{name}-lt.patch
+Patch1:		%{name}-vala.patch
 URL:		http://launchpad.net/zeitgeist
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	dee-devel >= 1.0.2
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gnome-common
 BuildRequires:	gobject-introspection-devel >= 1.30.0
@@ -54,7 +55,6 @@ Summary(pl.UTF-8):	Biblioteka Zeitgeist
 Group:		Libraries
 Requires:	glib2 >= 1:2.26.0
 Requires:	sqlite3 >= 3.7.11
-Conflicts:	zeitgeist < 0.9.12-1
 
 %description libs
 This package provides Zeitgeist library.
@@ -107,6 +107,9 @@ Summary:	bash-completion for Zeitgeist
 Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla Zeitgeist
 Group:		Applications/Shells
 Requires:	bash-completion
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n bash-completion-zeitgeist
 This package provides bash-completion for Zeitgeist.
@@ -117,6 +120,7 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -124,8 +128,8 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-fts \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--enable-fts
 %{__make}
 
 %install
@@ -137,8 +141,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libzeitgeist-2.0.la
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/zeitgeist/doc
 
-%py_postclean
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,8 +153,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*
 
@@ -161,6 +164,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)