rpms/ghc-gtk2hs/F-10 ghc-gtk2hs.spec,1.6,1.7

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-gtk2hs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5728

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
backport rawhide updates for building with ghc-6.10.1:

* Fri Feb  6 2009 Jens Petersen <petersen at redhat.com> - 0.9.13-8.20081108
- use bcond

* Wed Dec 17 2008 Jens Petersen <petersen at redhat.com> - 0.9.13-7.20081108
- turn on docs and buildrequire ghc-doc
- buildrequire dbus-devel for gconf private

* 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)
- update docs building to haddock 2.4.1




Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-10/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	6 Feb 2009 00:02:49 -0000	1.7
@@ -3,18 +3,19 @@
 %define pkg_name gtk2hs
 %define ghc_version 6.10.1
 
-%define build_docs 0
-%define build_mozembed 0
-%define build_cairo 1
-%define build_opengl 1
+%bcond_without prof
+%bcond_without doc
+%bcond_without cairo
+%bcond_without opengl
+%bcond_with mozembed
 
 %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:        8%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -31,22 +32,26 @@
 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 %{with docs}
+BuildRequires:  haddock >= 2.4.1
+BuildRequires:  ghc-doc = %{ghc_version}
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
-BuildRequires:  GConf2-devel
-%if %{build_mozembed}
+BuildRequires:  GConf2-devel, dbus-devel
+%if %{with mozembed}
 BuildRequires:  xulrunner-devel
 %endif
-%if %{build_cairo}
+%if %{with cairo}
 BuildRequires:  cairo-devel
 %endif
-%if %{build_opengl}
+%if %{with opengl}
 BuildRequires:  gtkglext-devel
 %endif
 Requires:       ghc = %{ghc_version}
@@ -67,7 +72,7 @@
 sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
-%if %{build_docs}
+%if %{with docs}
 %package doc
 Summary:        Haskell Gtk+ GUI library documentation
 Group:          Development/Libraries
@@ -81,13 +86,13 @@
 This package contains the gtk2hs documentation.
 %endif
 
-%if %{build_opengl}
+%if %{with opengl}
 %package gtkglext
 Summary:        Haskell binding for gtkglext
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
-Requires:       ghc-%{name} = %{version}-%{release}
-Requires:       gtkglext
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtkglext-devel
 Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
 Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
@@ -96,7 +101,7 @@
 %endif
 
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %package mozembed
 Summary:        Haskell binding for gtkembedmoz
 Group:          Development/Libraries
@@ -124,10 +129,13 @@
 %{?snapdate:autoreconf}
 
 %build
+%if %{with docs}
+export HADDOCK=%{_bindir}/haddock-2.4.1
+%endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
         --enable-packager-mode \
-%if %{build_docs}
+%if %{with docs}
         --enable-docs \
 %endif
 %if 0
@@ -137,13 +145,13 @@
         --enable-libglade \
         --enable-gconf \
         --enable-sourceview \
-%if %{build_mozembed}
-        --enable-firefox \
+%if %{with mozembed}
+        --enable-xulrunner \
 %endif
-%if %{build_opengl}
+%if %{with opengl}
         --enable-opengl \
 %endif
-%if %{build_cairo}
+%if %{with cairo}
         --enable-cairo
 %endif
 
@@ -155,16 +163,16 @@
 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}
+%if %{with cairo}
         cairo \
 %endif
-%if %{build_mozembed}
+%if %{with mozembed}
         mozembed \
 %endif
         ; do
-  touch %{buildroot}%{pkg_libdir}/HS${i}.o
+  install --mode=0644 -p HS${i}.o %{buildroot}%{pkg_libdir}
 done
 
 
@@ -179,7 +187,7 @@
 
 %post
 for i in glib \
-%if %{build_cairo}
+%if %{with cairo}
         cairo \
 %endif
         gtk \
@@ -199,7 +207,7 @@
         glade \
         sourceview \
         gtk \
-%if %{build_cairo}
+%if %{with cairo}
         cairo \
 %endif
         glib \
@@ -208,7 +216,7 @@
 done
 fi
 
-%if %{build_docs}
+%if %{with docs}
 %post doc
 %ghc_reindex_haddock
 
@@ -216,7 +224,7 @@
 %ghc_reindex_haddock
 %endif
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %post mozembed
 %{ghcpkg_inst mozembed}
 
@@ -226,7 +234,7 @@
 fi
 %endif
 
-%if %{build_opengl}
+%if %{with opengl}
 %post gtkglext
 %{ghcpkg_inst gtkglext}
 
@@ -243,40 +251,40 @@
 %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}
+%if %{with 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
 
 
-%if %{build_docs}
+%if %{with docs}
 %files doc
 %defattr(-,root,root,-)
 %doc ChangeLog TODO demo
@@ -284,31 +292,43 @@
 %endif
 
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %files mozembed
 %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
 
 
-%if %{build_opengl}
+%if %{with opengl}
 %files gtkglext
 %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 Feb  6 2009 Jens Petersen <petersen at redhat.com> - 0.9.13-8.20081108
+- use bcond
+
+* Wed Dec 17 2008 Jens Petersen <petersen at redhat.com> - 0.9.13-7.20081108
+- turn on docs and buildrequire ghc-doc
+- buildrequire dbus-devel for gconf private
+
+* 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)
+- update docs building to 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