rpms/gtk2hs/devel gtk2hs.spec,1.38,1.39

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20488

Modified Files:
	gtk2hs.spec 
Log Message:
- add build_docs switch
- set HADDOCK to find haddock-0.9
- add opengl gtkglext subpackage (Ian Collier, #327541)
- require xulrunner-devel instead of firefox-devel
- update prereq's to script requires




Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gtk2hs.spec	23 Jun 2008 00:22:49 -0000	1.38
+++ gtk2hs.spec	23 Jun 2008 01:02:28 -0000	1.39
@@ -3,8 +3,10 @@
 %define pkgname gtk
 %define ghc_version 6.8.3
 
+%define build_docs 1
 %define build_mozembed 0
 %define build_cairo 1
+%define build_opengl 1
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
@@ -23,17 +25,22 @@
 ExcludeArch:	alpha ppc64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
+%if %{build_docs}
 BuildRequires:  haddock09
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  GConf2-devel
 %if %{build_mozembed}
-BuildRequires:  firefox-devel
+BuildRequires:  xulrunner-devel
 %endif
 %if %{build_cairo}
 BuildRequires:  cairo-devel
 %endif
+%if %{build_opengl}
+BuildRequires:  gtkglext-devel
+%endif
 
 %description
 A Gtk+ binding for the functional language Haskell featuring
@@ -62,6 +69,7 @@
 sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
+%if %{build_docs}
 %package doc
 Summary:        Haskell Gtk+ GUI library documentation
 Group:          Development/Libraries
@@ -72,6 +80,21 @@
 widgets.
 
 This package contains the gtk2hs documentation.
+%endif
+
+%if %{build_opengl}
+%package -n ghc-%{name}-gtkglext
+Summary:        Haskell binding for gtkglext
+Group:          Development/Libraries
+Requires:       ghc = %{ghc_version}
+Requires:       ghc-%{name} = %{version}-%{release}
+Requires:       gtkglext
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
+
+%description -n ghc-%{name}-gtkglext
+A Haskell binding of GtkGlExt for gtk2hs.
+%endif
 
 
 %if %{build_mozembed}
@@ -81,7 +104,8 @@
 Requires:       ghc = %{ghc_version}
 Requires:       ghc-%{name} = %{version}-%{release}
 Requires:       firefox-devel
-PreReq:         %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
 %description -n ghc-%{name}-mozembed
 A Haskell binding of GtkEmbedMoz for gtk2hs.
@@ -101,18 +125,26 @@
 
 
 %build
+%if %{build_docs}
+export HADDOCK=%{_bindir}/haddock-0.9
+%endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
         --prefix=%{_prefix} \
         --libdir=%{ghclibdir} \
         --enable-packager-mode \
+%if %{build_docs}
         --enable-docs \
+%endif
         --enable-libglade \
         --enable-gconf \
         --enable-sourceview \
 %if %{build_mozembed}
         --enable-firefox \
 %endif
+%if %{build_opengl}
+        --enable-opengl \
+%endif
 %if %{build_cairo}
         --enable-cairo
 %endif
@@ -164,13 +196,6 @@
 %{ghcpkg_inst $i}
 done
 
-
-%if %{build_mozembed}
-%post -n ghc-%{name}-mozembed
-%{ghcpkg_inst mozembed}
-%endif
-
-
 %preun -n ghc-%{name}
 if [ "$1" = 0 ]; then
   for i in \
@@ -188,17 +213,29 @@
 done
 fi
 
-
 %if %{build_mozembed}
+%post -n ghc-%{name}-mozembed
+%{ghcpkg_inst mozembed}
+
 %preun -n ghc-%{name}-mozembed
 if [ "$1" = 0 ]; then
   %{ghcpkg_uninst mozembed}
 fi
 %endif
 
+%if %{build_opengl}
+%post -n ghc-%{name}-gtkglext
+%{ghcpkg_inst gtkglext}
+
+%preun -n ghc-%{name}-gtkglext
+if [ "$1" = 0 ]; then
+  %{ghcpkg_uninst gtkglext}
+fi
+%endif
+
 
 %files -n ghc-%{name}
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %dir %{_libdir}/ghc
 %dir %{ghclibdir}
@@ -238,14 +275,17 @@
 %{gtk2hsdir}/imports/sourceview
 
 
+%if %{build_docs}
 %files doc
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc docs/reference
 %doc ChangeLog TODO demo
+%endif
 
 
 %if %{build_mozembed}
 %files -n ghc-%{name}-mozembed
+%defattr(-,root,root,-)
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
@@ -253,12 +293,26 @@
 %endif
 
 
+%if %{build_opengl}
+%files -n ghc-%{name}-gtkglext
+%defattr(-,root,root,-)
+%{gtk2hsdir}/gtkglext.package.conf
+%{gtk2hsdir}/libHSgtkglext.a
+%ghost %{gtk2hsdir}/HSgtkglext.o
+%{gtk2hsdir}/imports/gtkglext
+%endif
+
+
 %changelog
 * Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 0.9.12.1-10.fc10
 - build with ghc-6.8.3
+- add build_docs switch
 - use haddock09 to fix build failure (#440493)
 - merge ghcver subpackage into ghc subpackage in line with ghc
 - obsolete old ghcver packages
+- add opengl gtkglext subpackage (Ian Collier, #327541)
+- require xulrunner-devel instead of firefox-devel
+- update prereq's to script requires
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.12.1-9
 - Autorebuild for GCC 4.3