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

diff --git a/zeitgeist.spec b/zeitgeist.spec
index 96ac518..3c245e3 100644
--- a/zeitgeist.spec
+++ b/zeitgeist.spec
@@ -1,26 +1,45 @@
 Summary:	Framework providing Desktop activity awareness
 Summary(pl.UTF-8):	Szkielet zapewniający świadomość aktywności w środowisku graficznym
 Name:		zeitgeist
-Version:	0.8.2
-Release:	2
+Version:	1.0.3
+Release:	1
 License:	LGPL v2.1+
 Group:		Daemons
-Source0:	http://launchpad.net/zeitgeist/0.8/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5:	589e7de784d21177491780bffd11097d
+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:	automake >= 1:1.9
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-common
-BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libraptor2-rapper
-BuildRequires:	python >= 1:2.6
-BuildRequires:	python-rdflib >= 3.0.0
-Requires:	python-%{name} = %{version}-%{release}
-Requires:	python-modules-sqlite
-Requires:	python-pygobject >= 2.16.0
-Requires:	python-pyxdg
-Suggests:	zeitgeist-datahub
+BuildRequires:	autoconf >= 2.65
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	dbus-devel
+BuildRequires:	dee-devel >= 1.0.2
+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:	json-glib-devel >= 0.14.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.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)
 
 %description
@@ -37,29 +56,93 @@ osobami itp.) i udostępniająca informacje o nich innym aplikacjom.
 Potrafi ustalić powiązania między elementami w oparciu o podobieństwo
 i wzorce użycia.
 
-%package -n python-%{name}
+%package libs
+Summary:	Zeitgeist library
+Summary(pl.UTF-8):	Biblioteka Zeitgeist
+Group:		Libraries
+Requires:	glib2 >= 1:2.36.0
+Requires:	sqlite3 >= 3.7.11
+
+%description libs
+This package provides Zeitgeist library.
+
+%description libs -l pl.UTF-8
+Ten pakiet dostarcza bibliotekę Zeitgeist.
+
+%package devel
+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.36.0
+
+%description devel
+This package provides development files for Zeitgeist library.
+
+%description devel -l pl.UTF-8
+Ten pakiet dostarcza pliki programistyczne dla biblioteki Zeitgeist.
+
+%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
+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 >= 2:0.18.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n vala-zeitgeist
+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 >= 2.0
+%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}
+%{__gettextize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules \
+	--enable-fts
 %{__make}
 
 %install
@@ -68,25 +151,55 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%py_postclean
-
-%find_lang %{name}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libzeitgeist-2.0.la
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/zeitgeist/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
+%files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYRIGHT ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS TODO
 %attr(755,root,root) %{_bindir}/zeitgeist-daemon
-%{_datadir}/dbus-1/services/org.gnome.zeitgeist.service
-%{_datadir}/zeitgeist/_zeitgeist
+%attr(755,root,root) %{_bindir}/zeitgeist-datahub
+/etc/xdg/autostart/zeitgeist-datahub.desktop
+%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*
-# -devel? (for daemon extensions development)
-%{_pkgconfigdir}/zeitgeist-daemon.pc
+%{_mandir}/man1/zeitgeist-datahub.1*
+%{systemduserunitdir}/zeitgeist.service
+%{systemduserunitdir}/zeitgeist-fts.service
 
-%files -n python-%{name}
+%files libs
 %defattr(644,root,root,755)
-%{py_sitescriptdir}/zeitgeist
+%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)
+%attr(755,root,root) %{_libdir}/libzeitgeist-2.0.so
+%{_includedir}/zeitgeist-2.0
+%{_datadir}/gir-1.0/Zeitgeist-2.0.gir
+%{_pkgconfigdir}/zeitgeist-2.0.pc
+
+%files -n python3-%{name}
+%defattr(644,root,root,755)
+%{py3_sitescriptdir}/zeitgeist
 %{_datadir}/zeitgeist/ontology
+
+%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)
+%{bash_compdir}/zeitgeist-daemon