From 5d087a9f68e31bbcec8c5ed05f69aef748879a7b Mon Sep 17 00:00:00 2001 From: David King Date: Jan 29 2019 23:25:50 +0000 Subject: Update to 1.0.1 --- diff --git a/.gitignore b/.gitignore index 667e02b..25f27b7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ zeitgeist-0.5.0.tar.gz /zeitgeist-0.9.16.20140808gitce9affa.tar.gz /zeitgeist-0.9.16.tar.xz /zeitgeist-1.0.tar.xz +/zeitgeist-1.0.1.tar.xz diff --git a/sources b/sources index 74a4735..3672bfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeitgeist-1.0.tar.xz) = e8fa4db7202c5dceb6cb960775651624bdcd7fc2005019ff6491d7c139ccf036e865977adbd98ae3c9b97b22e5cf28534b64f01fde58b7bc89c0f0f8d13383e8 +SHA512 (zeitgeist-1.0.1.tar.xz) = e800de89ac574af49b9449fe5cb623994ff2515ff36ba94d81f0b1eebcb93b1aeecfbde14c0dd1ea24aef36b5b69be33c2cdf2ef69fc17a69bf98b40dae80cef diff --git a/zeitgeist-1.0-fix-service-file-template.patch b/zeitgeist-1.0-fix-service-file-template.patch deleted file mode 100644 index 092e854..0000000 --- a/zeitgeist-1.0-fix-service-file-template.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 1bcc8585275b4a8a9d47652cfe2ee4d64d155c1f Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -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 - diff --git a/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch new file mode 100644 index 0000000..979e76b --- /dev/null +++ b/zeitgeist-1.0.1-fix-ontology-vala-syntax.patch @@ -0,0 +1,62 @@ +From cc4603a2b5d9e6f36d196432042f6f0048dd5d89 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Thu, 5 Apr 2018 13:12:51 +0200 +Subject: [PATCH] ontology: Avoid ownership mismatches of container elements to + fix memleak + +--- + libzeitgeist/ontology.vala.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libzeitgeist/ontology.vala.in b/libzeitgeist/ontology.vala.in +index 63171701..768fd005 100644 +--- a/libzeitgeist/ontology.vala.in ++++ b/libzeitgeist/ontology.vala.in +@@ -56,7 +56,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -64,7 +64,7 @@ namespace Zeitgeist + { + results.append (uri); + // Recursively get the other parents +- foreach (string parent_uri in get_all_parents (uri)) ++ foreach (unowned string parent_uri in get_all_parents (uri)) + if (results.index (parent_uri) == -1) + results.append (parent_uri); + } +@@ -76,7 +76,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -89,7 +89,7 @@ namespace Zeitgeist + public static List get_children (string symbol_uri) + { + initialize_symbols (); +- var results = new List (); ++ var results = new List (); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +@@ -103,7 +103,7 @@ namespace Zeitgeist + { + initialize_symbols (); + +- var results = new List(); ++ var results = new List(); + var symbol = all_symbols.lookup (symbol_uri); + if (symbol == null) return results; + +-- +2.18.1 + diff --git a/zeitgeist.spec b/zeitgeist.spec index d6ff93e..d9073a6 100644 --- a/zeitgeist.spec +++ b/zeitgeist.spec @@ -1,6 +1,6 @@ Name: zeitgeist -Version: 1.0 -Release: 8%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Framework providing Desktop activity awareness # most of the source code is LGPLv2+, except: # datahub/ is LGPLv3+ @@ -12,8 +12,7 @@ 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 +Patch0: zeitgeist-1.0.1-fix-ontology-vala-syntax.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(dee-icu-1.0) @@ -31,8 +30,6 @@ 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} @@ -75,17 +72,15 @@ This package contains Python 2 API for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 + +sed -i -e 's|/usr/bin/env python|/usr/bin/python2|' data/ontology2code ## 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 @@ -147,6 +142,9 @@ make check || true %{python2_sitelib}/zeitgeist/ %changelog +* Tue Jan 29 2019 David King - 1.0.1-1 +- Update to 1.0.1 + * Sat Jul 14 2018 Fedora Release Engineering - 1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild