rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.6,1.7

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7763

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
- install the .o files at build time rather than generating them at install
  (reported by Gregory Weber, #250767)
- build docs again with haddock 2.4.1




Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ghc-gtk2hs.spec	9 Nov 2008 06:49:59 -0000	1.6
+++ ghc-gtk2hs.spec	5 Dec 2008 09:44:43 -0000	1.7
@@ -3,7 +3,7 @@
 %define pkg_name gtk2hs
 %define ghc_version 6.10.1
 
-%define build_docs 0
+%define build_docs 1
 %define build_mozembed 0
 %define build_cairo 1
 %define build_opengl 1
@@ -11,10 +11,10 @@
 %define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
 %define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}
 
-Summary:        Haskell binding for gtk2
+Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-gtk2hs
 Version:        0.9.13
-Release:        5%{?snapdate:.%{snapdate}}%{?dist}
+Release:        6%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -31,11 +31,14 @@
 Source:         http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.gz
 %endif
 URL:            http://gtk2hs.sourceforge.net/
-# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
-ExcludeArch:	alpha ppc64
+# we have only bootstrapped ghc on the following archs:
+ExclusiveArch:	i386 x86_64 ppc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  happy, alex
+%if %{build_docs}
+BuildRequires:  haddock >= 2.4.1
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
@@ -124,6 +127,9 @@
 %{?snapdate:autoreconf}
 
 %build
+%if %{build_docs}
+export HADDOCK=%{_bindir}/haddock-2.4.1
+%endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
         --enable-packager-mode \
@@ -138,7 +144,7 @@
         --enable-gconf \
         --enable-sourceview \
 %if %{build_mozembed}
-        --enable-firefox \
+        --enable-xulrunner \
 %endif
 %if %{build_opengl}
         --enable-opengl \
@@ -155,7 +161,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
 
-# make ghost files
+# install .o files
 for i in gconf glade glib gtk sourceview soegtk \
 %if %{build_cairo}
         cairo \
@@ -164,7 +170,7 @@
         mozembed \
 %endif
         ; do
-  touch %{buildroot}%{pkg_libdir}/HS${i}.o
+  install --mode=0644 -p HS${i}.o %{buildroot}%{pkg_libdir}
 done
 
 
@@ -243,36 +249,36 @@
 %dir %{pkg_libdir}
 %{pkg_libdir}/gtk.package.conf
 %{pkg_libdir}/libHSgtk.a
-%ghost %{pkg_libdir}/HSgtk.o
+%{pkg_libdir}/HSgtk.o
 %dir %{pkg_libdir}/imports
 %{pkg_libdir}/imports/gtk
 %if %{build_cairo}
 %{pkg_libdir}/cairo.package.conf
 %{pkg_libdir}/libHScairo.a
-%ghost %{pkg_libdir}/HScairo.o
+%{pkg_libdir}/HScairo.o
 %{pkg_libdir}/imports/cairo
 %endif
 %{pkg_libdir}/gconf.package.conf
 %{pkg_libdir}/libHSgconf.a
-%ghost %{pkg_libdir}/HSgconf.o
+%{pkg_libdir}/HSgconf.o
 %{pkg_libdir}/imports/gconf
 %{pkg_libdir}/glade.package.conf
 %{pkg_libdir}/libHSglade.a
-%ghost %{pkg_libdir}/HSglade.o
+%{pkg_libdir}/HSglade.o
 %{pkg_libdir}/imports/glade
 %{pkg_libdir}/glib.package.conf
 %{pkg_libdir}/libHSglib.a
-%ghost %{pkg_libdir}/HSglib.o
+%{pkg_libdir}/HSglib.o
 %{pkg_libdir}/imports/glib
 %dir %{pkg_libdir}/include
 %{pkg_libdir}/include/gtk2hs-config.h
 %{pkg_libdir}/soegtk.package.conf
 %{pkg_libdir}/libHSsoegtk.a
-%ghost %{pkg_libdir}/HSsoegtk.o
+%{pkg_libdir}/HSsoegtk.o
 %{pkg_libdir}/imports/soegtk
 %{pkg_libdir}/sourceview.package.conf
 %{pkg_libdir}/libHSsourceview.a
-%ghost %{pkg_libdir}/HSsourceview.o
+%{pkg_libdir}/HSsourceview.o
 %{pkg_libdir}/imports/sourceview
 
 
@@ -289,7 +295,7 @@
 %defattr(-,root,root,-)
 %{pkg_libdir}/mozembed.package.conf
 %{pkg_libdir}/libHSmozembed.a
-%ghost %{pkg_libdir}/HSmozembed.o
+%{pkg_libdir}/HSmozembed.o
 %{pkg_libdir}/imports/mozembed
 %endif
 
@@ -299,16 +305,21 @@
 %defattr(-,root,root,-)
 %{pkg_libdir}/gtkglext.package.conf
 %{pkg_libdir}/libHSgtkglext.a
-%ghost %{pkg_libdir}/HSgtkglext.o
+%{pkg_libdir}/HSgtkglext.o
 %{pkg_libdir}/imports/gtkglext
 %endif
 
 
 %changelog
+* Fri Dec  5 2008 Jens Petersen <petersen at redhat.com> - 0.9.13-6.20081108
+- install the .o files at build time rather than generating them at install
+  (reported by Gregory Weber, #250767)
+- build docs again with haddock 2.4.1
+
 * Sun Nov  9 2008 Jens Petersen <petersen at redhat.com> - 0.9.13-5.20081108
 - gtk2hs was renamed to ghc-gtk2hs (#468314)
 - update to snapshot of darcs tip which builds with ghc-6.10.1
-- disable docs for now since haddock cannot handle them
+- disable docs for now since haddock-2.2 cannot handle them
 - add some snapshot logic
 - buildrequires happy and alex
 - gtk2hs-fasm-0.9.13.patch is no longer needed