[gauche-gtk] Rebuild for Gauche 0.9.3.x

[Michel Alexandre Salim]

commit b6589d2d5186de53337cf0b90d028755ae2a0cc5
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun May 13 20:31:25 2012 +0700

    Rebuild for Gauche 0.9.3.x
    
    - Update to latest snapshot
    - Enable graphical tests
    - Spec clean-ups

 .gitignore                            |    3 +-
 gauche-gtk-0.6-double_defs.patch      |   64 ---------------------------------
 gauche-gtk-0.6-pixbufinc.patch        |   12 ------
 gauche-gtk.spec                       |   56 ++++++++++++++++------------
 sources                               |    2 +-
 5 files changed, 34 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6955580..8eeed19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/gauche-gtk-0.6-01a6056209d21.tar.xz
-/gauche-gtk-0.6-598828842a339.tar.xz
+/gauche-gtk-0.6-f7d3f802f3750.tar.xz
diff --git a/gauche-gtk.spec b/gauche-gtk.spec
index 5798622..2aed227 100644
--- a/gauche-gtk.spec
+++ b/gauche-gtk.spec
@@ -1,33 +1,32 @@
 %global gauche_main_version 0.9
-%global gauche_version %{gauche_main_version}.2
 
-%global snapshot_date 20110725
-%global git_revision  598828842a339
+%global snapshot_date 20120403
+%global git_revision  f7d3f802f3750
 %global alphatag      %{snapshot_date}git%{git_revision}
 
 Name:           gauche-gtk
 Epoch:          1
 Version:        0.6
-Release:        0.4.%{alphatag}%{?dist}
+Release:        0.5.%{alphatag}%{?dist}
 Summary:        Gauche extension module to use GTK
 
+%if 0%{?rhel}
 Group:          Development/Languages
+%endif
 License:        BSD
-URL:            http://www.shiro.dreamhost.com/scheme/gauche
+URL:            http://practical-scheme.net/
 # no stable release yet
 # git clone git://github.com/shirok/Gauche-gtk2.git
 # (cd Gauche-gtk2 && git archive --format=tar \
 #  --prefix=%%{name}-%%{version}/ %%{git_revision} \
 # | xz ) > %%{name}-%%{version}-%%{git_revision}.tar.xz
 Source0:        %{name}-%{version}-%{git_revision}.tar.xz
-Patch0:         %{name}-0.6-pixbufinc.patch
-# stub generator generates definitions even for hard-coded functions
-# on F-16+; comment them out after 'make stubs'
-Patch1:         %{name}-0.6-double_defs.patch
-# gtk.scm requires a module that is no longer shipped
-Patch2:         %{name}-0.6-missing_requires.patch
+
+%if 0%{?el5}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gauche-devel = %{gauche_version}
+%endif
+
+BuildRequires:  gauche-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtkglext-devel
 BuildRequires:  libX11-devel
@@ -36,7 +35,11 @@ BuildRequires:  libICE-devel
 BuildRequires:  autoconf
 # used in test
 BuildRequires:  gauche-gl
+BuildRequires:  Xvfb xauth
+
 Requires:       gauche-gl
+
+# To match gauche
 ExcludeArch:    ppc64
 
 
@@ -46,7 +49,9 @@ Gauche extension module to use GTK.
 
 %package devel
 Summary:        Development files for %{name}
+%if 0%{?rhel}
 Group:          Development/Languages
+%endif
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -56,23 +61,18 @@ Development files for %{name}.
 %prep
 %setup -q
 autoconf
-%patch0 -p1 -b .pixbufinc
-%patch2 -p1 -b .missing_requires
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags freetype2` -fPIC" \
 %configure --enable-gtkgl --enable-glgd --enable-glgd-pango
 make stubs
-%if 0%{?fedora} >= 16
-cat %{PATCH1} | patch -p1
-%endif
-sed -i 's/.*GTK_DISABLE_DEPRECATED.*//g' src/gtkwidget.stub
 make %{?_smp_mflags} OPTFLAGS=
 
 
 %install
+%if 0%{?el5}
 rm -rf $RPM_BUILD_ROOT
+%endif
 mkdir -p $RPM_BUILD_ROOT`gauche-config --syslibdir`
 mkdir -p $RPM_BUILD_ROOT`gauche-config --sysarchdir`
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -81,11 +81,13 @@ chmod -c 644 */*.c # for debuginfo
 
 
 %check
-# 'make check' does not set return code properly;
-# saving output so it can be parsed later
-make check 2>&1 | tee test.log
-# Gtk test currently fails - better than no testing at all
-[ $(grep "^Testing.*failed\." test.log | grep -v Gtk | wc -l) == 0 ]
+# 'make check' does not set return code properly, but
+# outputs to test.log
+xvfb-run -a -w 1 make check
+# Gtk test currently fails.
+# four known failures reported upstream; fail if more failures occur
+# https://github.com/shirok/Gauche-gtk2/issues/2
+[ $(grep " ==> ERROR: GOT " test.log | wc -l) -le 4 ]
 
 
 %clean
@@ -107,6 +109,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 13 2012 Michel Salim <salimma at fedoraproject.org> - 1:0.6-0.5.20120403gitf7d3f802f3750
+- Rebuild for Gauche 0.9.3.x
+- Update to latest snapshot
+- Enable graphical tests
+- Spec clean-ups
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.6-0.4.20110725git598828842a339
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index e2741d2..6f29f7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1749ee6f416485144bc267d9b056ee0  gauche-gtk-0.6-598828842a339.tar.xz
+90e03a953cebcd86afc60149017fa2a0  gauche-gtk-0.6-f7d3f802f3750.tar.xz