From 04b830801eccef71581f3a6360150be874e1b1b5 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Sep 15 2011 16:27:39 +0000
Subject: Updated Git snapshot

Fix version numbering
Put header in -devel subpackage
Fix overlapping directory ownerships

---

diff --git a/.gitignore b/.gitignore
index 7828f58..a5ceeb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Gauche-gtk-0.4.1.tgz
-/Gauche-gtk-0.9-git20110214.tar.bz2
+/gauche-gtk-0.6-01a6056209d21.tar.xz
diff --git a/Gauche-gtk-0.9-pixbufinc.patch b/Gauche-gtk-0.9-pixbufinc.patch
deleted file mode 100644
index 5bc9ed2..0000000
--- a/Gauche-gtk-0.9-pixbufinc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Gauche-gtk2/src/h2s-gtk.scm.pixbufinc Gauche-gtk2/src/h2s-gtk.scm
---- Gauche-gtk2/src/h2s-gtk.scm.pixbufinc	2011-02-14 11:57:40.349898973 +0100
-+++ Gauche-gtk2/src/h2s-gtk.scm	2011-02-14 11:57:58.656116451 +0100
-@@ -63,7 +63,7 @@
-                  (call-with-input-file "PANGOFILES" port->string-list)))
- 
- (define (parse-gdk-pixbuf)
--  (parse-headers #`",|gtk-directory|/gdk-pixbuf"
-+  (parse-headers #`"/usr/include/gdk-pixbuf-2.0/gdk-pixbuf"
-                  (call-with-input-file "GDKPIXBUFFILES" port->string-list)))
- 
- ;; defaults for the gauche-gtk package:
diff --git a/gauche-gtk-0.6-pixbufinc.patch b/gauche-gtk-0.6-pixbufinc.patch
new file mode 100644
index 0000000..5bc9ed2
--- /dev/null
+++ b/gauche-gtk-0.6-pixbufinc.patch
@@ -0,0 +1,12 @@
+diff -up Gauche-gtk2/src/h2s-gtk.scm.pixbufinc Gauche-gtk2/src/h2s-gtk.scm
+--- Gauche-gtk2/src/h2s-gtk.scm.pixbufinc	2011-02-14 11:57:40.349898973 +0100
++++ Gauche-gtk2/src/h2s-gtk.scm	2011-02-14 11:57:58.656116451 +0100
+@@ -63,7 +63,7 @@
+                  (call-with-input-file "PANGOFILES" port->string-list)))
+ 
+ (define (parse-gdk-pixbuf)
+-  (parse-headers #`",|gtk-directory|/gdk-pixbuf"
++  (parse-headers #`"/usr/include/gdk-pixbuf-2.0/gdk-pixbuf"
+                  (call-with-input-file "GDKPIXBUFFILES" port->string-list)))
+ 
+ ;; defaults for the gauche-gtk package:
diff --git a/gauche-gtk.spec b/gauche-gtk.spec
index 97af838..eaf3170 100644
--- a/gauche-gtk.spec
+++ b/gauche-gtk.spec
@@ -1,26 +1,33 @@
-%define gauche_version 0.9.1
-%define gauche_main_version 0.9
+%global gauche_main_version 0.9
+%global gauche_version %{gauche_main_version}.2
+
+%global snapshot_date 20110228
+%global git_revision  01a6056209d21
+%global alphatag      %{snapshot_date}git%{git_revision}
 
 Name:           gauche-gtk
-Version:        0.9
-Release:        1.git20110214%{?dist}
-Summary:	Gauche extension module to use GTK
+Version:        0.6
+Release:        0.1.%{alphatag}%{?dist}
+Summary:        Gauche extension module to use GTK
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://www.shiro.dreamhost.com/scheme/gauche
-Source:		Gauche-gtk-0.9-git20110214.tar.bz2
-Patch4:         Gauche-gtk-0.9-pixbufinc.patch
+# 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
+Source:         %{name}-%{version}-%{git_revision}.tar.xz
+Patch4:         %{name}-0.6-pixbufinc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	gauche-devel = %{gauche_version}
-BuildRequires:	gtk2-devel
-BuildRequires:	gtkglext-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libXt-devel
-BuildRequires:	libICE-devel
+BuildRequires:  gauche-devel = %{gauche_version}
+BuildRequires:  gtk2-devel
+BuildRequires:  gtkglext-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libICE-devel
 BuildRequires:  autoconf
-Requires:	gauche = %{gauche_version}
-Requires:	gauche-gl
 ExcludeArch:    ppc64
 
 
@@ -28,8 +35,17 @@ ExcludeArch:    ppc64
 Gauche extension module to use GTK.
 
 
+%package devel
+Summary:        Development files for %{name}
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+Development files for %{name}.
+
+
 %prep
-%setup -q -n Gauche-gtk2
+%setup -q
 autoconf
 %patch4 -p1
 
@@ -57,12 +73,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/gauche-%{gauche_main_version}
-%{_datadir}/gauche-%{gauche_main_version}
 %doc COPYING README VERSION examples
+%{_libdir}/gauche-%{gauche_main_version}/site/*/*.so
+%{_datadir}/gauche-%{gauche_main_version}/site/lib/.packages/Gauche-gtk2.gpd
+%{_datadir}/gauche-%{gauche_main_version}/site/lib/gtk.scm
+%{_datadir}/gauche-%{gauche_main_version}/site/lib/gtk
+%{_datadir}/gauche-%{gauche_main_version}/site/lib/h2s
+
+
+%files devel
+%{_libdir}/gauche-%{gauche_main_version}/site/include/*
 
 
 %changelog
+* Thu Sep 15 2011 Michel Salim <salimma@fedoraproject.org> - 1:0.6-0.1.20110725git598828842a339
+- Updated Git snapshot
+- Fix version numbering
+- Put header in -devel subpackage
+- Fix overlapping directory ownerships
+
 * Sat Aug  1 2009 Gerard Milmeister <gemi@bluewin.ch> - 0.4.1-21
 - fix for gtk 2.17
 
diff --git a/sources b/sources
index 7816252..754fe04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94bf00acbda87176f4ee06bd9fa1b57a  Gauche-gtk-0.9-git20110214.tar.bz2
+6031f37f7feffb6396c85cfe50e21e1b  gauche-gtk-0.6-01a6056209d21.tar.xz