rpms/ghc-gtk2hs/devel .cvsignore, 1.2, 1.3 ghc-gtk2hs.spec, 1.1, 1.2 sources, 1.2, 1.3

[Jens Petersen]

Author: petersen

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

Modified Files:
	.cvsignore ghc-gtk2hs.spec sources 
Log Message:
- gtk2hs was renamed to ghc-gtk2hs (#468314)
- update to snapshot of darcs tip which builds with ghc-6.10.1
- add some snapshot logic
- disable docs for now since haddock cannot handle them




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2008 02:25:51 -0000	1.2
+++ .cvsignore	9 Nov 2008 03:59:42 -0000	1.3
@@ -1 +1 @@
-gtk2hs-0.9.13.tar.gz
+gtk2hs-20081108.tar.gz


Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghc-gtk2hs.spec	9 Nov 2008 02:25:51 -0000	1.1
+++ ghc-gtk2hs.spec	9 Nov 2008 03:59:42 -0000	1.2
@@ -1,9 +1,9 @@
-#%%define snapdate 20061116
+%define snapdate 20081108
 
 %define pkg_name gtk2hs
 %define ghc_version 6.10.1
 
-%define build_docs 1
+%define build_docs 0
 %define build_mozembed 0
 %define build_cairo 1
 %define build_opengl 1
@@ -14,7 +14,7 @@
 Summary:        Haskell binding for gtk2
 Name:           ghc-gtk2hs
 Version:        0.9.13
-Release:        4%{?dist}
+Release:        5%{?snapdate:.%{snapdate}}%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -22,7 +22,14 @@
 # rest is all LGPL
 License:        LGPLv2+
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
+%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}%{?snapdate:-%{snapdate}}.tar.gz
+%else
+Source:         http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.gz
+%endif
 Patch0:         gtk2hs-fasm-0.9.13.patch
 URL:            http://gtk2hs.sourceforge.net/
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
@@ -109,10 +116,15 @@
 
 
 %prep
+%if %{?snapdate:1}0
+%setup -q -n %{pkg_name}-%{snapdate}
+%else
 %setup -q -n %{pkg_name}-%{version}
+%endif
 %ifarch ppc
 %patch0 -p1 -b .0-fasm-ppc~
 %endif
+%{?snapdate:autoreconf}
 
 %build
 %configure \
@@ -121,6 +133,10 @@
 %if %{build_docs}
         --enable-docs \
 %endif
+%if 0
+	--enable-gio \
+%endif
+	--enable-gtk \
         --enable-libglade \
         --enable-gconf \
         --enable-sourceview \
@@ -292,6 +308,12 @@
 
 
 %changelog
+* 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
+- add some snapshot logic
+- disable docs for now since haddock cannot handle them
+
 * Fri Nov 07 2008 Bryan O'Sullivan <bos at serpentine.com> - 0.9.13-4
 - Rebuild for GHC 6.10.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2008 02:25:51 -0000	1.2
+++ sources	9 Nov 2008 03:59:42 -0000	1.3
@@ -1 +1 @@
-130a13b0cbbf1ab933583f33cae16f7e  gtk2hs-0.9.13.tar.gz
+a6a7bb2362ec3ed31696330368653fe3  gtk2hs-20081108.tar.gz