Attachment 923876 Details for Bug 1126461 – include upstream patch

[patch] include upstream patch

0001-Add-upstream-patch-to-make-VAPI-file-usable-1126461.patch (text/plain), 2.49 KB, created by David King on 2014-08-04 13:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-08-04 13:30:21 UTC

Size: 2.49 KB

patch

obsolete

>From d8f5486d522a57f6d92dcc63d569ed3f87377518 Mon Sep 17 00:00:00 2001
>From: David King <amigadave@amigadave.com>
>Date: Mon, 4 Aug 2014 14:26:33 +0100
>Subject: [PATCH] Add upstream patch to make VAPI file usable (#1126461)
>
>---
> zeitgeist-0.9.14-vapi-dependency-fix.patch | 19 +++++++++++++++++++
> zeitgeist.spec                             |  8 +++++++-
> 2 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 zeitgeist-0.9.14-vapi-dependency-fix.patch
>
>diff --git a/zeitgeist-0.9.14-vapi-dependency-fix.patch b/zeitgeist-0.9.14-vapi-dependency-fix.patch
>new file mode 100644
>index 0000000..e5692cd
>--- /dev/null
>+++ b/zeitgeist-0.9.14-vapi-dependency-fix.patch
>@@ -0,0 +1,19 @@
>+From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
>+From: Philip Withnall <philip@tecnocode.co.uk>
>+Date: Sun, 16 Feb 2014 15:08:49 +0000
>+Subject: libzeitgeist: Add a missing dependency on gio-2.0
>+
>+This actually makes the zeitgeist vapi file usable.
>+
>+Signed-off-by: Seif Lotfy <seif@lotfy.com>
>+
>+diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
>+index ff8d39b..59eec5d 100644
>+--- a/libzeitgeist/zeitgeist-2.0.deps
>++++ b/libzeitgeist/zeitgeist-2.0.deps
>+@@ -1 +1,2 @@
>+ zeitgeist-datamodel-2.0
>++gio-2.0
>+-- 
>+cgit v0.10.2
>+
>diff --git a/zeitgeist.spec b/zeitgeist.spec
>index 19398ce..b0b6443 100644
>--- a/zeitgeist.spec
>+++ b/zeitgeist.spec
>@@ -1,7 +1,7 @@
> Summary:	Framework providing Desktop activity awareness
> Name:		zeitgeist
> Version:	0.9.14
>-Release:	4%{?dist}
>+Release:	5%{?dist}
> 
> # most of the source code is LGPLv2+, except:
> # datahub/ is LGPLv3+
>@@ -13,6 +13,8 @@ Release:	4%{?dist}
> License:	LGPLv2+ and LGPLv3+ and GPLv2+
> URL:		https://launchpad.net/zeitgeist
> Source0:	http://launchpad.net/%{name}/0.9/%{version}/+download/%{name}-%{version}.tar.xz
>+# Applied upstream after 0.9.15.
>+Patch0:         zeitgeist-0.9.14-vapi-dependency-fix.patch
> 
> BuildRequires:	dbus-devel
> BuildRequires:	gettext
>@@ -63,6 +65,7 @@ developing applications that use %{name}.
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> ## nuke unwanted rpaths, see also
> ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
>@@ -116,6 +119,9 @@ rm -rf %{buildroot}%{_datadir}/zeitgeist/doc
> %{_datadir}/vala/vapi/zeitgeist-datamodel-2.0.vapi
> 
> %changelog
>+* Mon Aug 04 2014 David King <amigadave@amigadave.com> - 0.9.14-5
>+- Add upstream patch to make VAPI file usable (#1126461)
>+
> * Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 0.9.14-4
> - Rebuilt for gobject-introspection 1.41.4
> 
>-- 
>2.0.3
>

Actions: View | Diff

Attachments on bug 1126461: 923876