rpms/tracker
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.3.0

Browse Source
This commit is contained in:
David King 2014-11-28 15:04:40 +00:00
parent 1fab5586f7
commit 684e287eb8
5 changed files with 166 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-Only-autostart-in-GNOME-771601.patch Normal file
View File

@ -0,0 +1,54 @@
From 5b4d18d3f8b69773be59ccc45bd09e5fa84d5f1b Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Fri, 28 Nov 2014 14:21:37 +0000
Subject: [PATCH] Only autostart in GNOME (#771601)
https://bugzilla.redhat.com/show_bug.cgi?id=771601
---
src/miners/fs/tracker-miner-fs.desktop.in.in | 2 +-
src/miners/rss/tracker-miner-rss.desktop.in.in | 2 +-
src/tracker-store/tracker-store.desktop.in.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/miners/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index a1620f6..75dba52 100644
--- a/src/miners/fs/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
@@ -12,7 +12,7 @@ X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
diff --git a/src/miners/rss/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in.in
index 49be401..505aec7 100644
--- a/src/miners/rss/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in.in
@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
diff --git a/src/tracker-store/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in.in
index 78e855d..aff4c16 100644
--- a/src/tracker-store/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in.in
@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Store
--
2.1.0

99
0001-build-Fix-symlink-target-for-D-Bus-service-files.patch Normal file
View File

@ -0,0 +1,99 @@
From 72a8e44e0f13f10f941a6a5333744fcd9e47d5ae Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Fri, 28 Nov 2014 14:59:31 +0000
Subject: [PATCH] build: Fix symlink target for D-Bus service files
Do not link to a target in DESTDIR, but instead link to a path in the
install root.
https://bugzilla.gnome.org/show_bug.cgi?id=740864
---
src/miners/apps/Makefile.am | 2 +-
src/miners/fs/Makefile.am | 2 +-
src/miners/rss/Makefile.am | 2 +-
src/miners/user-guides/Makefile.am | 2 +-
src/plugins/evolution/Makefile.am | 2 +-
src/tracker-extract/Makefile.am | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 9e450b7..9bff30d 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -33,7 +33,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 904f6fb..7c97498 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -69,7 +69,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 6385c0e..369fca2 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -33,7 +33,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 74aea0c..4b82562 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -33,7 +33,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index 595613a..4e46e24 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -55,7 +55,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index a04a9c0..92622bd 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -592,7 +592,7 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard
install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
- $(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+ $(LN_S) -f "$(datadir)/tracker/miners/$(service_DATA)" \
"$(DESTDIR)$(servicedir)/$(service_DATA)"
uninstall-local:
--
2.1.0

2
sources
View File

@ -1 +1 @@
37b1bef444994a986a6d348759614a59 tracker-1.2.4.tar.xz
d2bf810d726a3ec56bdddb76824a418c tracker-1.3.0.tar.xz

33
tracker-0.15-onlyshowin.patch
View File

@ -1,33 +0,0 @@
--- tracker-0.15.1/data/tracker-miner-fs.desktop.in.in.orig 2012-12-14 08:27:16.000000000 +0000
+++ tracker-0.15.1/data/tracker-miner-fs.desktop.in.in 2013-01-26 16:34:28.202775189 +0000
@@ -12,7 +12,7 @@
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
--- tracker-0.15.1/data/tracker-miner-rss.desktop.in.in.orig 2013-01-26 16:31:20.410192713 +0000
+++ tracker-0.15.1/data/tracker-miner-rss.desktop.in.in 2013-01-26 16:31:26.841246912 +0000
@@ -11,7 +11,7 @@
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
--- tracker-0.15.1/data/tracker-store.desktop.in.in.orig 2012-12-14 08:27:16.000000000 +0000
+++ tracker-0.15.1/data/tracker-store.desktop.in.in 2013-01-26 16:34:52.310978315 +0000
@@ -11,7 +11,7 @@
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Store

20
tracker.spec
View File

@ -15,21 +15,22 @@
%endif
Name: tracker
Version: 1.2.4
Release: 3%{?dist}
Version: 1.3.0
Release: 1%{?dist}
Summary: Desktop-neutral search tool and indexer
Group: Applications/System
License: GPLv2+
URL: https://wiki.gnome.org/Projects/Tracker
Source0: https://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz
# only autostart in Gnome, see also
# https://bugzilla.redhat.com/show_bug.cgi?id=771601
Patch1: tracker-0.15-onlyshowin.patch
Patch0: 0001-Only-autostart-in-GNOME-771601.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1133924
Patch2: 0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch
# Avoid symlinks with targets inside the buildroot.
# https://bugzilla.gnome.org/show_bug.cgi?id=740864
Patch1: 0001-build-Fix-symlink-target-for-D-Bus-service-files.patch
BuildRequires: desktop-file-utils
BuildRequires: firefox
@ -174,8 +175,8 @@ This package contains the documentation for tracker
%prep
%setup -q
%patch1 -p1 -b .onlyshowin
%patch2 -p1 -b .rlimits
%patch0 -p1 -b .autostart-gnome
%patch1 -p1 -b .symlink
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@ -321,6 +322,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Fri Nov 28 2014 David King <amigadave@amigadave.com> - 1.3.0-1
- Update to 1.3.0
* Sun Nov 16 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.4-3
- Obsolete compat-tracker016 from rhughes-f20-gnome-3-12 copr