From 717bd705568e0f70683477ec160797ec4633843e22d30d7bdb20421fabcba83d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 6 Sep 2010 21:01:13 +0000 Subject: [PATCH] Accepting request 47304 from GNOME:Apps Copy from GNOME:Apps/tracker based on submit request 47304 from user vuntz OBS-URL: https://build.opensuse.org/request/show/47304 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=8 --- README.SUSE.flickr | 6 ++ README.SUSE.rss | 7 ++ initial-data.ttl | 20 ++++++ tracker.changes | 24 +++++++ tracker.spec | 162 ++++++++++++++++++++++++++++++++++----------- 5 files changed, 180 insertions(+), 39 deletions(-) create mode 100644 README.SUSE.flickr create mode 100644 README.SUSE.rss create mode 100644 initial-data.ttl diff --git a/README.SUSE.flickr b/README.SUSE.flickr new file mode 100644 index 0000000..fba5e68 --- /dev/null +++ b/README.SUSE.flickr @@ -0,0 +1,6 @@ +There is currently no graphical way to configure the Flickr miner. +However, assocation with your Flickr account can be manually done with +a tool like d-feet or any other D-Bus client. See this wiki page for +more information: + + http://live.gnome.org/Tracker/Documentation/WebMiners/Association diff --git a/README.SUSE.rss b/README.SUSE.rss new file mode 100644 index 0000000..5a3c4c5 --- /dev/null +++ b/README.SUSE.rss @@ -0,0 +1,7 @@ +There is currently no graphical way to configure the RSS miner. +Feed channels have to be registered manually into Tracker. + +As an example, the file initial-data.ttl contains feeds that you +can register with this command: + + tracker-import initial-data.ttl diff --git a/initial-data.ttl b/initial-data.ttl new file mode 100644 index 0000000..1aa5e15 --- /dev/null +++ b/initial-data.ttl @@ -0,0 +1,20 @@ +@prefix rdf: . +@prefix nrl: . +@prefix nid3: . +@prefix nao: . +@prefix nco: . +@prefix nmo: . +@prefix nfo: . +@prefix nie: . +@prefix ncal: . +@prefix xsd: . +@prefix mfo: . + + a mfo:FeedChannel; + nie:title "Planet Maemo"; + nie:description "Blog entries from Maemo community"; + nie:contentLastModified "2009-03-11T20:20:55+00:00". + + a mfo:FeedChannel; + nie:title "Planet GNOME"; + nie:contentLastModified "2009-03-11T18:29:08+00:00". diff --git a/tracker.changes b/tracker.changes index 8c851b3..ca5e23d 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Sep 6 09:42:14 CEST 2010 - vuntz@opensuse.org + +- Rename evolution-tracker subpackage to tracker-miner-evolution, + with appropriate Provides/Obsoletes since this is first a miner. + Make it also provide evolution-plugin-tracker, since it's a + plugin for evolution too. +- Split flickr and rss miners in tracker-miner-flickr and + tracker-miner-rss subpackages since they are not that useful by + default, and add README.SUSE files for them to explain how to use + them. +- Split applications/files miner to tracker-miner-files, and add a + Recommends to tracker to get it installed by default. This will + enable people to keep tracker and still easily remove this miner + if they don't want to index files. +- Rename nautilus-tracker subpackage to + nautilus-extension-tracker-tags and nautilus-applet subpackage to + gnome-panel-applet-tracker, to follow the naming convention for + plugins and extensions. Add appropriate Provides/Obsoletes. +- Add packageand(tracker:gnome-panel) Supplements to + gnome-panel-applet-tracker. +- Remove useless call to autoreconf. +- Use %_smp_mflags for parallel build. + ------------------------------------------------------------------- Thu Sep 2 20:19:38 CEST 2010 - vuntz@opensuse.org diff --git a/tracker.spec b/tracker.spec index 56caf4b..5020b3b 100644 --- a/tracker.spec +++ b/tracker.spec @@ -20,13 +20,17 @@ Name: tracker Version: 0.9.19 -Release: 1 +Release: 2 # FIXME: 2010-03-24 building gtk-doc fails because of a bug in graphviz License: GPLv2+ Summary: Powerful object database, tag/metadata database, search tool and indexer Url: http://projects.gnome.org/tracker/ Group: Productivity/Other -Source: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 +Source1: README.SUSE.flickr +Source2: README.SUSE.rss +# File missing from tarball, see bgo#628859 +Source3: initial-data.ttl # PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. See bgo#622288 for how it should be done properly. Patch1: tracker-removeable-media-off.patch BuildRequires: NetworkManager-devel @@ -77,6 +81,8 @@ BuildRequires: update-desktop-files BuildRequires: vala-devel BuildRequires: zlib-devel Recommends: %{name}-lang +# We want to index files by default, if possible +Recommends: %{name}-miner-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +100,62 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. +%package miner-evolution +License: GPLv2+ +Summary: Tracker miner to index Evolution mails +Group: System/GUI/GNOME +Requires: %{name} = %{version} +Requires: evolution +Supplements: packageand(%{name}:evolution} +# Name changed during development of 11.4 +Provides: evolution-tracker = %{version} +Obsoletes: evolution-tracker < %{version} +# A generic provides, since this is also an evolution plugin +Provides: evolution-plugin-tracker = %{version} + +%description miner-evolution +Tracker is a powerful desktop-neutral first class object +database, tag/metadata database, search tool and indexer. + +This package contains an Evolution plugin that will index Evolution +mails. + +%package miner-files +License: GPLv2+ +Summary: Tracker miner to index files and applications +Group: System/GUI/GNOME +Requires: %{name} = %{version} + +%description miner-files +Tracker is a powerful desktop-neutral first class object +database, tag/metadata database, search tool and indexer. + +This package contains a miner to index files and applications. + +%package miner-flickr +License: GPLv2+ +Summary: Tracker miner to index Flickr images +Group: System/GUI/GNOME +Requires: %{name} = %{version} + +%description miner-flickr +Tracker is a powerful desktop-neutral first class object +database, tag/metadata database, search tool and indexer. + +This package contains a miner to index Flickr images. + +%package miner-rss +License: GPLv2+ +Summary: Tracker miner to index ATOM and RSS feeds +Group: System/GUI/GNOME +Requires: %{name} = %{version} + +%description miner-rss +Tracker is a powerful desktop-neutral first class object +database, tag/metadata database, search tool and indexer. + +This package contains a miner to index ATOM and RSS feeds. + %package gui License: GPLv2+ Summary: Graphical User Interface for Tracker @@ -225,34 +287,24 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. -%package applet +%package -n gnome-panel-applet-tracker License: GPLv2+ Summary: A GNOME panel applet for Tracker Group: System/GUI/GNOME Requires: %{name} = %{version} Recommends: %{name}-lang +Supplements: packageand(%{name}:gnome-panel} +# Name changed during development of 11.4 +Provides: tracker-applet = %{name} +Obsoletes: tracker-applet < %{name} -%description applet +%description -n gnome-panel-applet-tracker Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. This package contains a panel applet to easily use Tracker. -%package -n evolution-tracker -License: GPLv2+ -Summary: Tracker Plugin for Evolution -Group: System/GUI/GNOME -Requires: %{name} = %{version} -Requires: evolution -Supplements: packageand(%{name}:evolution} - -%description -n evolution-tracker -Tracker is a powerful desktop-neutral first class object -database, tag/metadata database, search tool and indexer. - -This package contains an evolution plugin for Tracker integration. - -%package -n nautilus-tracker +%package -n nautilus-extension-tracker-tags License: GPLv2+ Summary: Tracker Plugin for Nautilus Group: System/GUI/GNOME @@ -260,21 +312,28 @@ Requires: %{name} = %{version} Requires: nautilus Recommends: %{name}-lang Supplements: packageand(%{name}:nautilus} +# Name changed during development of 11.4 +Provides: nautilus-tracker = %{version} +Obsoletes: nautilus-tracker < %{version} -%description -n nautilus-tracker +%description -n nautilus-extension-tracker-tags Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. -This package contains an nautilus plugin for Tracker integration. +This package contains an nautilus plugin to tag files with Tracker. %lang_package %prep %setup -q translation-update-upstream %patch1 -p1 +cp %{S:1} src/miners/flickr/README.SUSE +cp %{S:2} src/miners/rss/README.SUSE +# Remove this when file is added to tarball, bgo#628859 +test ! -f examples/rss-reader/initial-data.ttl +cp %{S:3} examples/rss-reader/ %build -autoreconf -fi %configure \ --enable-libvorbis \ --enable-libflac \ @@ -284,7 +343,7 @@ autoreconf -fi --enable-tracker-preferences \ --disable-functional-tests # --enable-gtk-doc -make %{?jobs:-j%jobs} +%__make %{?_smp_mflags} %install %makeinstall @@ -327,9 +386,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README NEWS -%{_sysconfdir}/xdg/autostart/tracker-miner-flickr.desktop -%{_sysconfdir}/xdg/autostart/tracker-miner-fs.desktop -%{_sysconfdir}/xdg/autostart/tracker-miner-rss.desktop %{_sysconfdir}/xdg/autostart/tracker-store.desktop %{_bindir}/%{name}-control %{_bindir}/%{name}-explorer @@ -341,21 +397,16 @@ rm -rf %{buildroot} %{_bindir}/%{name}-status %{_bindir}/%{name}-tag %{_libexecdir}/%{name}-extract -%{_libexecdir}/%{name}-miner-flickr -%{_libexecdir}/%{name}-miner-fs -%{_libexecdir}/%{name}-miner-rss %{_libexecdir}/%{name}-store %{_libexecdir}/%{name}-writeback %{_libdir}/%{name}-0.9/ %{_datadir}/%{name}/ %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Extract.service -%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner* %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service %{_mandir}/man1/tracker-control.1* %{_mandir}/man1/tracker-extract.1* %{_mandir}/man1/tracker-import.1* %{_mandir}/man1/tracker-info.1* -%{_mandir}/man1/tracker-miner-fs.1* %{_mandir}/man1/tracker-search.1* %{_mandir}/man1/tracker-sparql.1* %{_mandir}/man1/tracker-stats.1* @@ -364,16 +415,54 @@ rm -rf %{buildroot} %{_mandir}/man1/tracker-tag.1* %{_mandir}/man5/tracker-extract.cfg.5* %{_mandir}/man5/tracker-fts.cfg.5* -%{_mandir}/man5/tracker-miner-fs.cfg.5* %{_mandir}/man5/tracker-store.cfg.5* # Exclude files which live in other packages %exclude %{_datadir}/%{name}/icons/thumbnail_frame.png %exclude %{_datadir}/%{name}/icons/tracker-applet-*.png +%exclude %{_datadir}/%{name}/miners/tracker-miner-applications.desktop +%exclude %{_datadir}/%{name}/miners/tracker-miner-evolution.desktop +%exclude %{_datadir}/%{name}/miners/tracker-miner-files.desktop +%exclude %{_datadir}/%{name}/miners/tracker-miner-flickr.desktop +%exclude %{_datadir}/%{name}/miners/tracker-miner-rss.desktop %exclude %{_datadir}/%{name}/GNOME_Search_Bar_Applet.xml %exclude %{_datadir}/%{name}/tracker-preferences.ui %exclude %{_datadir}/%{name}/tracker-search-bar.ui %exclude %{_datadir}/%{name}/tst.ui +%files miner-evolution +%defattr(-,root,root) +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner.EMails.service +%{_datadir}/%{name}/miners/tracker-miner-evolution.desktop +%{_libdir}/evolution/*/plugins/liborg-freedesktop-Tracker-evolution-plugin.so +%{_libdir}/evolution/*/plugins/org-freedesktop-Tracker-evolution-plugin.eplug + +%files miner-files +%defattr(-,root,root) +%{_sysconfdir}/xdg/autostart/tracker-miner-fs.desktop +%{_libexecdir}/%{name}-miner-fs +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service +%{_datadir}/%{name}/miners/tracker-miner-applications.desktop +%{_datadir}/%{name}/miners/tracker-miner-files.desktop +%{_mandir}/man1/tracker-miner-fs.1* +%{_mandir}/man5/tracker-miner-fs.cfg.5* + +%files miner-flickr +%defattr(-,root,root) +%doc src/miners/flickr/README.SUSE +%{_sysconfdir}/xdg/autostart/tracker-miner-flickr.desktop +%{_libexecdir}/%{name}-miner-flickr +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner.Flickr.service +%{_datadir}/%{name}/miners/tracker-miner-flickr.desktop + +%files miner-rss +%defattr(-,root,root) +%doc src/miners/rss/README.SUSE examples/rss-reader/initial-data.ttl +%{_sysconfdir}/xdg/autostart/tracker-miner-rss.desktop +%{_libexecdir}/%{name}-miner-rss +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Miner.RSS.service +%{_datadir}/%{name}/miners/tracker-miner-rss.desktop + %files gui %defattr(-,root,root) # preferences @@ -425,7 +514,7 @@ rm -rf %{buildroot} %{_datadir}/vala/vapi/*.deps %{_datadir}/vala/vapi/*.vapi -%files applet +%files -n gnome-panel-applet-tracker %defattr(-,root,root) %{_datadir}/%{name}/GNOME_Search_Bar_Applet.xml %{_datadir}/%{name}/tracker-search-bar.ui @@ -433,12 +522,7 @@ rm -rf %{buildroot} %{_libexecdir}/tracker-search-bar %{_mandir}/man1/tracker-search-bar.1* -%files -n evolution-tracker -%defattr(-,root,root) -%{_libdir}/evolution/*/plugins/liborg-freedesktop-Tracker-evolution-plugin.so -%{_libdir}/evolution/*/plugins/org-freedesktop-Tracker-evolution-plugin.eplug - -%files -n nautilus-tracker +%files -n nautilus-extension-tracker-tags %defattr(-,root,root) %{_libdir}/nautilus/extensions-2.0/libnautilus-tracker-tags*