Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
David King
dbd0cb4054 Fix service file variable substitution (#1464693) 2018-05-08 16:06:08 +01:00
2 changed files with 33 additions and 1 deletions

View file

@ -0,0 +1,19 @@
From 1bcc8585275b4a8a9d47652cfe2ee4d64d155c1f Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 27 Feb 2017 16:27:36 +0100
Subject: Fix placeholder in systemd service template
diff --git a/extensions/fts++/zeitgeist-fts.service.in b/extensions/fts++/zeitgeist-fts.service.in
index 93bf8f6..6459c0c 100644
--- a/extensions/fts++/zeitgeist-fts.service.in
+++ b/extensions/fts++/zeitgeist-fts.service.in
@@ -4,4 +4,4 @@ Description=Zeitgeist full-text search indexer
[Service]
Type=dbus
BusName=org.gnome.zeitgeist.SimpleIndexer
-ExecStart=@libexecdir@/zeitgeist-fts
+ExecStart=@pkglibexecdir@/zeitgeist-fts
--
cgit v0.10.2

View file

@ -1,6 +1,6 @@
Name: zeitgeist
Version: 1.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Framework providing Desktop activity awareness
# most of the source code is LGPLv2+, except:
# datahub/ is LGPLv3+
@ -12,6 +12,9 @@ Summary: Framework providing Desktop activity awareness
License: LGPLv2+ and LGPLv3+ and GPLv2+
URL: https://launchpad.net/zeitgeist
Source0: http://launchpad.net/%{name}/1.0/%{version}/+download/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1464693
Patch0: zeitgeist-1.0-fix-service-file-template.patch
BuildRequires: pkgconfig(dee-icu-1.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
@ -27,6 +30,9 @@ BuildRequires: raptor2
BuildRequires: systemd
BuildRequires: vala
BuildRequires: xapian-core-devel
# For patch0.
BuildRequires: autoconf automake /usr/bin/autopoint libtool
Requires: dbus
Requires: python2-%{name} = %{version}-%{release}
Obsoletes: zeitgeist-datahub < 0.9.5-4
@ -69,12 +75,16 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1
## nuke unwanted rpaths, see also
## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
# For patch0.
autoreconf --force --install
%configure --enable-fts --enable-datahub --disable-silent-rules
%make_build
@ -138,6 +148,9 @@ make check || true
%{python2_sitelib}/zeitgeist/
%changelog
* Thu Sep 21 2017 David King <amigadave@amigadave.com> - 1.0-3
- Fix service file variable substitution (#1464693)
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild