[Gtk2hs-commit] gtk2hs ChangeLog,1.75,1.76 Makefile,1.13,1.14 VERSION,1.4,1.5 configure.in,1.23,1.24 gtk2hs.spec.in,1.4,1.5

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv7385

Modified Files:
	ChangeLog Makefile VERSION configure.in gtk2hs.spec.in 
Log Message:
2003-07-03  Jens Petersen  <pet...@ha...>

	* mogul/Makefile (INSTALLDIR): Set to mogul, so that mogul gets
	installed in its own subdir.

	* gtk/layout/Notebook.chs (notebookGetNPages): New function.
	Export it.

	* gtk/general/Gtk.hs: Import and re-export Gdk.

	* gtk/gdk/Gdk.chs: New module for gdk.h.  Currently just provides beep.

	* gtk/gdk/Drawable.chs (drawPixbuf): Doc fix: s/arg src/arg pb/.

	* gtk/Makefile: Define Pixbuf-HEADER and Gdk-HEADER.

	* gtk2hs.spec.in (Requires): Require ghc5.  Post and preun require
	ghc-pkg.
	(build): Configure --with-hc.
	(preun): Ignore package removal errors.

	* configure.in: --with-hc no longer requires a full-path, when
	requested compiler is in path.  When looking for HOpenGL pass "-l"
	to ghc-pkg, since "--list-packages" confuses ghc-pkg-6.0 built
	with ghc5.

	* VERSION: Bump version to 0.9.3.50.

	* Makefile (dist): LN already includes the "-s" option.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	23 May 2003 01:01:24 -0000	1.75
+++ ChangeLog	3 Jul 2003 05:19:36 -0000	1.76
@@ -1,3 +1,30 @@
+2003-07-03  Jens Petersen  <pet...@ha...>
+
+	* gtk/layout/Notebook.chs (notebookGetNPages): New function.
+	Export it.
+
+	* gtk/general/Gtk.hs: Import and re-export Gdk.
+
+	* gtk/gdk/Gdk.chs: New module for gdk.h.  Currently just provides beep.
+
+	* gtk/gdk/Drawable.chs (drawPixbuf): Doc fix: s/arg src/arg pb/.
+
+	* gtk/Makefile: Define Pixbuf-HEADER and Gdk-HEADER.
+
+	* gtk2hs.spec.in (Requires): Require ghc5.  Post and preun require
+	ghc-pkg.
+	(build): Configure --with-hc.
+	(preun): Ignore package removal errors.
+
+	* configure.in: --with-hc no longer requires a full-path, when
+	requested compiler is in path.  When looking for HOpenGL pass "-l"
+	to ghc-pkg, since "--list-packages" confuses ghc-pkg-6.0 built
+	with ghc5.
+
+	* VERSION: Bump version to 0.9.3.50.
+
+	* Makefile (dist): LN already includes the "-s" option.
+
 2003-05-23  Jens Petersen  <pet...@re...>
 
 	* gendoc/XMLwrite.hs (makeSymDescr): Move colspecs inside the
@@ -23,10 +50,6 @@
 	onTestCollapseRow and onTestExpandRow signals. Patch submitted by
 	Duncan Coutts <du...@co...>.
 	
-2003-05-17 Axel Simon <A....@ke...>
-
-	* gtk/gdk/Pixbuf.chs: Fixed documentation on creating inline pictures.
-
 2003-05-18  Jens Petersen  <pet...@re...>
 
 	* gtk/pango/PangoLayout.chs (layoutIterGetLineExtents): Keep last
@@ -38,6 +61,12 @@
 	* doc/mogul.xml: Docbook 4.2.
 
 2003-05-17 Axel Simon <A....@ke...>
+
+	* gtk/gdk/Pixbuf.chs: Fixed documentation on creating inline pictures.
+
+2003-05-17 Axel Simon <A....@ke...>
+
+	0.9.3 release.
 
 	* c2hs/base/syntax/Lexer.hs: There is a bug in either c2hs or the
 	compiler when parsing the header files on PowerPC. I added a line

Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	23 May 2003 01:01:25 -0000	1.13
+++ Makefile	3 Jul 2003 05:19:36 -0000	1.14
@@ -94,7 +94,7 @@
 dist :
 	$(RM) -r $(TARNAME)
 	$(RM) $(TARNAME).tar $(TARNAME).tar.gz
-	$(LN) -s . $(TARNAME)
+	$(LN) . $(TARNAME)
 	$(strip $(TAR) cf $(addsuffix .tar,$(TARNAME)) \
 	  $(addprefix $(TARNAME)/,$(EXTRA_TARFILES)))
 	$(MAKE) -Cc2hs tarsource

Index: VERSION
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/VERSION,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VERSION	21 Mar 2003 10:52:25 -0000	1.4
+++ VERSION	3 Jul 2003 05:19:36 -0000	1.5
@@ -1 +1 @@
-0.9.3
+0.9.3.50

Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.in	19 May 2003 16:36:36 -0000	1.23
+++ configure.in	3 Jul 2003 05:19:36 -0000	1.24
@@ -101,7 +101,7 @@
 
 dnl Select a specific Haskell compiler and/or flags.
 AC_ARG_WITH(hc, 
-            [  --with-hc=HC            use Haskell compiler HC (full path required)],
+            [  --with-hc=HC            use Haskell compiler HC],
 	    [HC=$withval])
 
 AC_ARG_WITH(hcflags, 
@@ -112,7 +112,7 @@
 
 dnl Check for GHC-5.02 or greater.
 dnl (The next command is not executed, if $HC is already set.)
-AC_PATH_PROG(HC, ghc, ghc-not-found)
+AC_PATH_PROG(HC, [$HC ghc], ghc-not-found)
 if test $HC = ghc-not-found; then
  AC_MSG_ERROR([
 Could not find GHC!  This is the only supported compiler.
@@ -201,7 +201,7 @@
 
 dnl Reset the flag if HOpenGL is not installed
 FOUNDHOPENGL=yes;
-$GHCPKG --list-packages | $GREP OpenGL > /dev/null || FOUNDHOPENGL=no;
+$GHCPKG -l | $GREP OpenGL > /dev/null || FOUNDHOPENGL=no;
 if test x$FOUNDHOPENGL = xno; then ENABLE_OPENGL=no;fi;
 
 AC_MSG_RESULT($ENABLE_OPENGL)

Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtk2hs.spec.in	23 May 2003 01:01:25 -0000	1.4
+++ gtk2hs.spec.in	3 Jul 2003 05:19:36 -0000	1.5
@@ -8,15 +8,16 @@
 Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
 Name: gtk2hs
 Version: @VERSION@
-Release: 1.%(date +%%Y%%m%%d)
+Release: 0.%(date +%%Y%%m%%d)
 Copyright: LGPL
 Group: Development/Libraries
 Source: gtk2hs-%{version}.tar.gz
 URL: http://gtk2hs.sourceforge.net/
 BuildRoot: /var/tmp/gtk2hs-%{version}-%{release}-root
+Requires: ghc5 = %{_ghc_version}
 Requires: gtk2
-PreReq: ghc = %{_ghc_version}
-BuildRequires: ghc = %{_ghc_version} gtk2-devel %{?_with_c2hs: c2hs >= 0.10.6}
+Requires(post,preun): %{_bindir}/ghc-pkg-%{_ghc_version}
+BuildRequires: ghc5 = %{_ghc_version} gtk2-devel %{?_with_c2hs: c2hs >= 0.10.6}
 
 %description
 A Gtk2 binding for the functional language Haskell featuring
@@ -30,7 +31,7 @@
 %setup -q
 
 %build
-./configure %{?_with_c2hs} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
+./configure %{?_with_c2hs} --with-hc=ghc-%{_ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
 make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{_ghc_version}
 
 %install
@@ -51,8 +52,8 @@
 %preun
 rm -f %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2hs.o,mogul.o}
 if [ "$1" = 0 ]; then
-  ghc-pkg-%{_ghc_version} -r mogul
-  ghc-pkg-%{_ghc_version} -r gtk2
+  ghc-pkg-%{_ghc_version} -r mogul || :
+  ghc-pkg-%{_ghc_version} -r gtk2 || :
 fi
 
 %files