X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzeitgeist.git;a=blobdiff_plain;f=zeitgeist.spec;h=cbc41e11a8c955bde8b3f0897cea55ce5a651750;hp=88df8d52a49edf0205b54d06b90ec95b75640afb;hb=1e2ac2a5221bba51570f1abec051ef1575f48f8e;hpb=17d323f7bb2c6a1a33d3a9170d1f97e560ab1fa5

diff --git a/zeitgeist.spec b/zeitgeist.spec
index 88df8d5..cbc41e1 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,17 +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:	5
 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.9
+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
@@ -24,7 +26,8 @@ BuildRequires:	python-rdflib >= 3.0.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sqlite3-devel >= 3.7.11
 BuildRequires:	telepathy-glib-devel >= 0.18.0
-BuildRequires:	vala >= 0.18.0
+BuildRequires:	vala >= 2:0.18.0
+BuildRequires:	vala-telepathy-glib >= 0.18.0
 BuildRequires:	xapian-core-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus
@@ -64,6 +67,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
 
 %description devel
 This package provides development files for Zeitgeist library.
@@ -85,24 +89,12 @@ Python client library for Zeitgeist DBus API.
 %description -n python-%{name} -l pl.UTF-8
 Biblioteka kliencka w Pythonie do DBus API demona Zeitgeist.
 
-%package -n bash-completion-zeitgeist
-Summary:	bash-completion for Zeitgeist
-Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla Zeitgeist
-Group:		Applications/Shells
-Requires:	bash-completion
-
-%description -n bash-completion-zeitgeist
-This package provides bash-completion for Zeitgeist.
-
-%description -n bash-completion-zeitgeist -l pl.UTF-8
-Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
-
 %package -n vala-zeitgeist
 Summary:	Zeitgeist API for Vala language
 Summary(pl.UTF-8):	API Zeitgeist dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	vala >= 0.18.0
+Requires:	vala >= 2:0.18.0
 
 %description -n vala-zeitgeist
 Zeitgeist API for Vala language.
@@ -110,8 +102,25 @@ Zeitgeist API for Vala language.
 %description -n vala-zeitgeist -l pl.UTF-8
 API Zeitgeist dla języka Vala.
 
+%package -n bash-completion-zeitgeist
+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.
+
+%description -n bash-completion-zeitgeist -l pl.UTF-8
+Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -119,8 +128,8 @@ API Zeitgeist dla języka Vala.
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-fts \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--enable-fts
 %{__make}
 
 %install
@@ -132,13 +141,11 @@ 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
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -146,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*
 
@@ -156,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)
@@ -169,12 +178,12 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitescriptdir}/zeitgeist
 %{_datadir}/zeitgeist/ontology
 
-%files -n bash-completion-zeitgeist
-%defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/zeitgeist-daemon
-
 %files -n vala-zeitgeist
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/zeitgeist-2.0.deps
 %{_datadir}/vala/vapi/zeitgeist-2.0.vapi
 %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
+
+%files -n bash-completion-zeitgeist
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/zeitgeist-daemon