rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.23,1.24

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
rebuild for ghc-6.10.3
- add bcond haddock and don't require separate haddock currently
- buildrequire ghc-rpm-macros





Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- ghc-gtk2hs.spec	12 May 2009 12:47:29 -0000	1.23
+++ ghc-gtk2hs.spec	15 May 2009 14:42:52 -0000	1.24
@@ -14,6 +14,8 @@
 %bcond_with gnomevfs
 %bcond_with mozembed
 
+%bcond_with haddock
+
 # ghc does not emit debug information
 %global debug_package %{nil}
 
@@ -24,7 +26,7 @@ management, unicode support, and wide co
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-%{pkg_name}
 Version:        0.10.1
-Release:        1%{?snapdate:.%{snapdate}}%{?dist}
+Release:        2%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -45,11 +47,12 @@ URL:            http://gtk2hs.sourceforg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-# for latest macros.ghc
-BuildRequires:  ghc >= 6.10.2-3
+BuildRequires:  ghc, ghc-rpm-macros
 BuildRequires:  happy, alex
 %if %{with docs}
+%if %{with haddock}
 BuildRequires:  haddock >= 2.4.1
+%endif
 BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
@@ -215,8 +218,10 @@ fi\
 
 %build
 %if %{with docs}
+%if %{with haddock}
 export HADDOCK=%{_bindir}/haddock-2.4.2
 %endif
+%endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
         --enable-packager-mode \
@@ -290,6 +295,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-2
+- add bcond haddock
+- buildrequire ghc-rpm-macros
+
 * Mon May 11 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-1
 - update to 0.10.1