Attachment 620277 Details for Bug 862254 – fix

[patch] fix

0001-Add-a-patch-from-upstream-for-make-j-reliability.patch (text/plain), 2.71 KB, created by Dan Winship on 2012-10-02 13:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2012-10-02 13:10:03 UTC

Size: 2.71 KB

patch

obsolete

>From 984cc68ae90418d46a788b162d2d25fa30f8a8a9 Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Tue, 2 Oct 2012 09:04:00 -0400
>Subject: [PATCH] Add a patch from upstream for "make -j" reliability
>
>---
> make-j-fix.patch    | 28 ++++++++++++++++++++++++++++
> telepathy-idle.spec |  7 ++++++-
> 2 files changed, 34 insertions(+), 1 deletion(-)
> create mode 100644 make-j-fix.patch
>
>diff --git a/make-j-fix.patch b/make-j-fix.patch
>new file mode 100644
>index 0000000..6560078
>--- /dev/null
>+++ b/make-j-fix.patch
>@@ -0,0 +1,28 @@
>+--- telepathy-idle-0.1.12/extensions/Makefile.am.make-j-fix	2012-08-24 11:37:28.202845677 -0400
>++++ telepathy-idle-0.1.12/extensions/Makefile.am	2012-08-24 11:42:42.951842517 -0400
>+@@ -42,7 +42,10 @@
>+ 		$(tools_dir)/doc-generator.xsl \
>+ 		$< > $@
>+ 
>+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
>++_gen/svc.h: _gen/svc.c
>++_gen/svc-gtk-doc.h: _gen/svc.c
>++
>++_gen/svc.c: _gen/all.xml \
>+ 	$(tools_dir)/glib-ginterface-gen.py
>+ 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
>+ 		--filename=_gen/svc --signal-marshal-prefix=_idle_ext \
>+--- telepathy-idle-0.1.12/extensions/Makefile.in.make-j-fix	2012-08-24 11:37:31.859845553 -0400
>++++ telepathy-idle-0.1.12/extensions/Makefile.in	2012-08-24 11:43:12.430842231 -0400
>+@@ -590,7 +590,10 @@
>+ 		$(tools_dir)/doc-generator.xsl \
>+ 		$< > $@
>+ 
>+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
>++_gen/svc.h: _gen/svc.c
>++_gen/svc-gtk-doc.h: _gen/svc.c
>++
>++_gen/svc.c: _gen/all.xml \
>+ 	$(tools_dir)/glib-ginterface-gen.py
>+ 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
>+ 		--filename=_gen/svc --signal-marshal-prefix=_idle_ext \
>diff --git a/telepathy-idle.spec b/telepathy-idle.spec
>index 73b3b53..f3c8a66 100644
>--- a/telepathy-idle.spec
>+++ b/telepathy-idle.spec
>@@ -6,13 +6,14 @@
> 
> Name:           telepathy-idle
> Version:        0.1.12
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        IRC connection manager for Telepathy
> 
> Group:          Applications/Communications
> License:        LGPLv2+
> URL:            http://telepathy.freedesktop.org/wiki/FrontPage
> Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
>+Patch0:         make-j-fix.patch
> 
> BuildRequires:  dbus-devel
> BuildRequires:	dbus-glib-devel
>@@ -36,6 +37,7 @@ A full-featured IRC connection manager for the Telepathy project.
> 
> %prep
> %setup -q
>+%patch0 -p1 -b .make-j-fix
> 
> %if %{run_tests}
> %check
>@@ -62,6 +64,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Tue Oct  2 2012 Dan Winship <danw@redhat.com> - 0.1.12-2
>+- Add a patch from upstream for "make -j" reliability
>+
> * Fri Aug  3 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.1.12-1
> - Update to 0.1.12.
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 862254: 620277