rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.10,1.11

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
use bcond


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ghc-gtk2hs.spec	17 Dec 2008 04:29:29 -0000	1.10
+++ ghc-gtk2hs.spec	5 Feb 2009 23:33:21 -0000	1.11
@@ -3,10 +3,11 @@
 %define pkg_name gtk2hs
 %define ghc_version 6.10.1
 
-%define build_docs 1
-%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}
@@ -14,7 +15,7 @@
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-gtk2hs
 Version:        0.9.13
-Release:        7%{?snapdate:.%{snapdate}}%{?dist}
+Release:        8%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -36,7 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
 BuildRequires:  happy, alex
-%if %{build_docs}
+%if %{with docs}
 BuildRequires:  haddock >= 2.4.1
 BuildRequires:  ghc-doc = %{ghc_version}
 %endif
@@ -44,13 +45,13 @@
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  GConf2-devel, dbus-devel
-%if %{build_mozembed}
+%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}
@@ -71,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
@@ -85,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:       %{name} = %{version}-%{release}
-Requires:       gtkglext
+Requires:       gtkglext-devel
 Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
 Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
@@ -100,7 +101,7 @@
 %endif
 
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %package mozembed
 Summary:        Haskell binding for gtkembedmoz
 Group:          Development/Libraries
@@ -128,13 +129,13 @@
 %{?snapdate:autoreconf}
 
 %build
-%if %{build_docs}
+%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
@@ -144,13 +145,13 @@
         --enable-libglade \
         --enable-gconf \
         --enable-sourceview \
-%if %{build_mozembed}
+%if %{with mozembed}
         --enable-xulrunner \
 %endif
-%if %{build_opengl}
+%if %{with opengl}
         --enable-opengl \
 %endif
-%if %{build_cairo}
+%if %{with cairo}
         --enable-cairo
 %endif
 
@@ -164,10 +165,10 @@
 
 # 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
@@ -186,7 +187,7 @@
 
 %post
 for i in glib \
-%if %{build_cairo}
+%if %{with cairo}
         cairo \
 %endif
         gtk \
@@ -206,7 +207,7 @@
         glade \
         sourceview \
         gtk \
-%if %{build_cairo}
+%if %{with cairo}
         cairo \
 %endif
         glib \
@@ -215,7 +216,7 @@
 done
 fi
 
-%if %{build_docs}
+%if %{with docs}
 %post doc
 %ghc_reindex_haddock
 
@@ -223,7 +224,7 @@
 %ghc_reindex_haddock
 %endif
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %post mozembed
 %{ghcpkg_inst mozembed}
 
@@ -233,7 +234,7 @@
 fi
 %endif
 
-%if %{build_opengl}
+%if %{with opengl}
 %post gtkglext
 %{ghcpkg_inst gtkglext}
 
@@ -253,7 +254,7 @@
 %{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
 %{pkg_libdir}/HScairo.o
@@ -283,7 +284,7 @@
 %{pkg_libdir}/imports/sourceview
 
 
-%if %{build_docs}
+%if %{with docs}
 %files doc
 %defattr(-,root,root,-)
 %doc ChangeLog TODO demo
@@ -291,7 +292,7 @@
 %endif
 
 
-%if %{build_mozembed}
+%if %{with mozembed}
 %files mozembed
 %defattr(-,root,root,-)
 %{pkg_libdir}/mozembed.package.conf
@@ -301,7 +302,7 @@
 %endif
 
 
-%if %{build_opengl}
+%if %{with opengl}
 %files gtkglext
 %defattr(-,root,root,-)
 %{pkg_libdir}/gtkglext.package.conf
@@ -312,6 +313,9 @@
 
 
 %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