Attachment 908340 Details for Bug 1037042 – compat-guile18 patch

[patch] compat-guile18 patch

drgeo-Drop-guile-2.0-patch-use-compat-guile18-instead.patch (text/plain), 1.67 KB, created by Yaakov Selkowitz on 2014-06-13 01:38:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-13 01:38:59 UTC

Size: 1.67 KB

patch

obsolete

>From dd36286100d11ab1e84d15d600386998213ef1f0 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 12 Jun 2014 20:36:04 -0500
>Subject: [PATCH 2/2] Drop guile-2.0 patch, use compat-guile18 instead
>
>---
> drgeo.spec | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drgeo.spec b/drgeo.spec
>index 3f3a430..17ec98a 100644
>--- a/drgeo.spec
>+++ b/drgeo.spec
>@@ -10,11 +10,10 @@ Source: http://dl.sf.net/ofset/drgeo-%{version}.tar.gz
> Patch0: drgeo-1.1.0-htmlview.patch
> Patch1: drgeo.patch
> Patch2: drgeo-1.1.0-anonymous-type.patch
>-Patch3: drgeo-1.1.0-guile-fixups.patch
> Patch4: drgeo-1.1.0-format-security.patch
> 
> BuildRequires: flex, bison, gmp-devel >= 2.0.2, desktop-file-utils
>-BuildRequires: guile-devel, libglade2-devel, intltool, gettext
>+BuildRequires: compat-guile18-devel, libglade2-devel, intltool, gettext
> 
> %description
> Dr. Geo is an interactive geometry GUI application. It allows one to create
>@@ -27,10 +26,12 @@ situation with students from primary or secondary level.
> %patch0 -p1
> %patch1 -p1
> %patch2 -p1
>-%patch3 -p1
> %patch4 -p1
> 
> %build
>+export GUILE=/usr/bin/guile1.8
>+export GUILE_CONFIG=/usr/bin/guile1.8-config
>+export GUILE_TOOLS=/usr/bin/guile1.8-tools
> %configure
> make %{?_smp_mflags}
> 
>@@ -60,6 +61,7 @@ rmdir %{buildroot}%{_datadir}/texmacs/
> %changelog
> * Thu Jun 12 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.0-27
> - Fix for -Werror=format-security (#1037024, #1106158)
>+- Revert guile-2.0 patch, use compat-guile18 instead
> 
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-26
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1037042: 908226 | 908340