X-Git-Url: http://git.pld-linux.org/?p=packages%2Fzeitgeist.git;a=blobdiff_plain;f=zeitgeist.spec;h=3c245e3857722775e1e7a51a5c9ed2d8a8aa9a54;hp=da5653da3c1b800143f1759e6a8b428ca5aacaac;hb=1e77dada06d1af9aca60868f77c5ffbdd528f0cb;hpb=6544abd8bbc746b044f063ef78096a458bcee1b3

diff --git a/zeitgeist.spec b/zeitgeist.spec
index da5653d..3c245e3 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,35 +1,43 @@
 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.3
+Release:	1
 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:	8258b5521d1f25d18f7ace3c974c5ab1
 Patch0:		%{name}-lt.patch
+Patch1:		%{name}-vala.patch
 URL:		http://launchpad.net/zeitgeist
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.65
 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 >= 0.19
+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:	libtool >= 2:2.2.6
+BuildRequires:	pkgconfig >= 1:0.21
+BuildRequires:	python3
+BuildRequires:	python3-rdflib >= 3.0.0
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.682
 BuildRequires:	sqlite3-devel >= 3.7.11
+BuildRequires:	tar >= 1:1.22
 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:	valadoc >= 0.2
 BuildRequires:	xapian-core-devel
+BuildRequires:	xz
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus
+Requires:	dee >= 1.0.2
+Requires:	json-glib >= 0.14.0
+Requires:	telepathy-glib >= 0.18.0
 Provides:	zeitgeist-datahub = %{version}-%{release}
 Obsoletes:	zeitgeist-datahub < 0.9.5-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +60,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 +74,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.
@@ -74,18 +82,19 @@ This package provides development files for Zeitgeist library.
 %description devel -l pl.UTF-8
 Ten pakiet dostarcza pliki programistyczne dla biblioteki Zeitgeist.
 
-%package -n python-%{name}
+%package -n python3-%{name}
 Summary:	Python client library for Zeitgeist DBus API
 Summary(pl.UTF-8):	Biblioteka kliencka w Pythonie do DBus API demona Zeitgeist
 Group:		Development/Languages/Python
-Requires:	python-dbus
-Requires:	python-modules
+Requires:	python3-dbus
+Requires:	python3-modules
+Obsoletes:	python-zeitgeist < 1.0.3
 Conflicts:	zeitgeist < 0.8.2-2
 
-%description -n python-%{name}
+%description -n python3-%{name}
 Python client library for Zeitgeist DBus API.
 
-%description -n python-%{name} -l pl.UTF-8
+%description -n python3-%{name} -l pl.UTF-8
 Biblioteka kliencka w Pythonie do DBus API demona Zeitgeist.
 
 %package -n vala-zeitgeist
@@ -94,6 +103,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 +117,7 @@ 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
@@ -119,11 +131,14 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Zeitgeist.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__intltoolize}
+%{__gettextize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-silent-rules \
@@ -151,11 +166,14 @@ 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 %{_libexecdir}/%{name}
+%attr(755,root,root) %{_libexecdir}/%{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)
@@ -171,9 +189,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/Zeitgeist-2.0.gir
 %{_pkgconfigdir}/zeitgeist-2.0.pc
 
-%files -n python-%{name}
+%files -n python3-%{name}
 %defattr(644,root,root,755)
-%{py_sitescriptdir}/zeitgeist
+%{py3_sitescriptdir}/zeitgeist
 %{_datadir}/zeitgeist/ontology
 
 %files -n vala-zeitgeist
@@ -184,4 +202,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