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

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-gtk2hs.spec 
Log Message:
- enable mozembed and drop gnomevfs bcond
- remove some redundant snapdate usage




Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ghc-gtk2hs.spec	15 May 2009 14:42:52 -0000	1.24
+++ ghc-gtk2hs.spec	24 May 2009 05:32:14 -0000	1.25
@@ -1,5 +1,3 @@
-#%%global snapdate 20090125
-
 %global pkg_name gtk2hs
 
 %bcond_without docs
@@ -11,9 +9,9 @@
 %bcond_without opengl
 %bcond_without gstreamer
 
-%bcond_with gnomevfs
-%bcond_with mozembed
+%bcond_without mozembed
 
+# external haddock
 %bcond_with haddock
 
 # ghc does not emit debug information
@@ -26,7 +24,7 @@ management, unicode support, and wide co
 Summary:        Haskell binding for gtk2 and related libraries
 Name:           ghc-%{pkg_name}
 Version:        0.10.1
-Release:        2%{?snapdate:.%{snapdate}}%{?dist}
+Release:        3%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -35,14 +33,10 @@ Release:        2%{?snapdate:.%{snapdate
 # rest is all LGPLv2+
 License:        LGPLv2+ and LGPLv3
 Group:          Development/Libraries
-%if %{?snapdate:1}0
 # snapshot tarball obtained by
 #  darcs get --partial http://code.haskell.org/gtk2hs/
-#  cd gtk2hs ; darcs dist darcs dist --dist-name=gtk2hs-%{snapdate}
-Source:         %{pkg_name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
-%else
+#  cd gtk2hs ; darcs dist darcs dist --dist-name=gtk2hs-%{version}.%{snapdate}
 Source:         http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.bz2
-%endif
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
@@ -66,7 +60,7 @@ BuildRequires:  GConf2-devel, dbus-devel
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel
 %endif
 %if %{with mozembed}
-BuildRequires:  xulrunner-devel
+BuildRequires:  xulrunner-devel-unstable
 %endif
 %if %{with cairo}
 BuildRequires:  cairo-devel
@@ -190,9 +184,6 @@ fi\
 %endif
 %subpackage glade libglade2 gtk
 %subpackage glib glib2
-%if %{with gnomevfs}
-%subpackage gnomevfs gnomevfs glib
-%endif
 %if %{with gstreamer}
 %subpackage gstreamer gstreamer glib
 %endif
@@ -208,11 +199,7 @@ fi\
 %subpackage svgcairo librsvg2 cairo
 
 %prep
-%if %{?snapdate:1}0
-%setup -q -n %{pkg_name}-%{version}-%{snapdate}
-%else
 %setup -q -n %{pkg_name}-%{version}
-%endif
 %{?snapdate:autoreconf}
 
 
@@ -225,6 +212,7 @@ export HADDOCK=%{_bindir}/haddock-2.4.2
 %configure \
         --with-hc=ghc-%{ghc_version} \
         --enable-packager-mode \
+        --disable-deprecated \
 %if %{with docs}
         --enable-docs \
 %endif
@@ -238,7 +226,7 @@ export HADDOCK=%{_bindir}/haddock-2.4.2
         --enable-gstreamer \
         --enable-gtksourceview2 \
 %if %{with mozembed}
-        --enable-xulrunner \
+        --enable-mozilla \
 %endif
 %if %{with opengl}
         --enable-opengl \
@@ -295,6 +283,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 24 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-3
+- enable mozembed and drop gnomevfs bcond
+- remove some redundant snapdate usage
+
 * Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-2
 - add bcond haddock
 - buildrequire ghc-rpm-macros