X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzeitgeist.git;a=blobdiff_plain;f=zeitgeist.spec;h=dde50a16ed5e406a62f9dfcba44ca00765330a70;hp=48f62756324fac3f96059a9db8b7d5bfbf38d9ed;hb=d14ab1c65b732bdea44b25063c3f01e633b3a097;hpb=c631b2026c18c47f81d5a2564b085f35398ac252

diff --git a/zeitgeist.spec b/zeitgeist.spec
index 48f6275..dde50a1 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,31 +1,33 @@
 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:	3
+Version:	1.0
+Release:	2
 License:	LGPL v2.1+
 Group:		Daemons
-Source0:	http://launchpad.net/zeitgeist/0.9/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5:	92371b864515389ffe7d70569f0bc9ed
+Source0:	http://launchpad.net/zeitgeist/1.0/%{version}/+download/%{name}-%{version}.tar.xz
+# Source0-md5:	5f894639cce2293c17407c9bd2689031
 Patch0:		%{name}-lt.patch
+Patch1:		%{name}-vala.patch
+Patch2:		%{name}-fts-service.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:	gnome-common
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.36.0
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	intltool >= 0.40.0
 BuildRequires:	json-glib-devel >= 0.14.0
 BuildRequires:	libraptor2-rapper
 BuildRequires:	python >= 1:2.6
 BuildRequires:	python-rdflib >= 3.0.0
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.682
 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 +54,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 +68,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 +96,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 +110,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,11 +124,15 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%{__intltoolize}
+%{__gettextize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-silent-rules \
@@ -148,18 +160,21 @@ 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
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/zeitgeist-fts
+%{_datadir}/dbus-1/services/org.gnome.zeitgeist.Engine.service
+%{_datadir}/dbus-1/services/org.gnome.zeitgeist.SimpleIndexer.service
 %{_mandir}/man1/zeitgeist-daemon.1*
 %{_mandir}/man1/zeitgeist-datahub.1*
+%{systemduserunitdir}/zeitgeist.service
+%{systemduserunitdir}/zeitgeist-fts.service
 
 %files libs
 %defattr(644,root,root,755)
 %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)
@@ -181,4 +196,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