rpms/gtk2hs/FC-6 .cvsignore, 1.2, 1.3 gtk2hs.spec, 1.5, 1.6 sources, 1.2, 1.3

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11323

Modified Files:
	.cvsignore gtk2hs.spec sources 
Log Message:
sync with devel for ghc66
- update to latest darcs snapshot for ghc66
- add soegtk and remove mogul ghc packages



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 May 2006 03:18:55 -0000	1.2
+++ .cvsignore	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-gtk2hs-0.9.10.tar.gz
+gtk2hs-0.9.10.2-20061116.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/gtk2hs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk2hs.spec	28 Sep 2006 05:37:36 -0000	1.5
+++ gtk2hs.spec	16 Nov 2006 04:43:35 -0000	1.6
@@ -1,17 +1,19 @@
-%define ghc_version 6.4.2
-%define ghcver ghc642
-#%%define mozver 1.5.0.6
+%define snapdate 20061116
+
+%define ghc_version 6.6
+%define ghcver ghc66
 
 %define build_mozembed 1
 %define build_cairo 1
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
-Version:        0.9.10
-Release:        4%{?dist}
+Version:        0.9.10.2
+Release:        0.1%{?dist}
 License:        LGPL
 Group:          Development/Libraries
-Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapd
+ate:-%{snapdate}}.tar.gz
 URL:            http://gtk2hs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
@@ -60,8 +62,7 @@
 management, unicode support, and wide coverage of Gtk+ 2 widgets.
 
 This package also includes the bindings for cairo, gconf, glade, glib, and
-sourceview, and the mogul wrapper library.  The libraries are compiled for
-ghc-%{ghc_version}.
+sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
 %package doc
@@ -99,7 +100,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?snapdate:-n %{name}-%{version}}
 
 
 %build
@@ -128,7 +129,7 @@
 make DESTDIR=%{buildroot} install
 
 # make ghost files
-for i in gconf glade glib gtk mogul sourceview \
+for i in gconf glade glib gtk sourceview soegtk \
 %if %{build_cairo}
         cairo \
 %endif
@@ -158,10 +159,10 @@
         cairo \
 %endif
         gtk \
-        mogul \
         gconf \
         glade \
         sourceview \
+	soegtk \
 ; do
 %{ghcpkg_inst $i}
 done
@@ -176,10 +177,10 @@
 %preun -n %{ghcver}-%{name}
 if [ "$1" = 0 ]; then
   for i in \
+	soegtk \
         gconf \
         glade \
         sourceview \
-        mogul \
         gtk \
 %if %{build_cairo}
         cairo \
@@ -218,35 +219,29 @@
 %{gtk2hsdir}/cairo.package.conf
 %{gtk2hsdir}/libHScairo.a
 %ghost %{gtk2hsdir}/HScairo.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/cairo
 %endif
 %{gtk2hsdir}/gconf.package.conf
 %{gtk2hsdir}/libHSgconf.a
 %ghost %{gtk2hsdir}/HSgconf.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/gconf
 %{gtk2hsdir}/glade.package.conf
 %{gtk2hsdir}/libHSglade.a
 %ghost %{gtk2hsdir}/HSglade.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glade
 %{gtk2hsdir}/glib.package.conf
 %{gtk2hsdir}/libHSglib.a
 %ghost %{gtk2hsdir}/HSglib.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/glib
 %dir %{gtk2hsdir}/include
 %{gtk2hsdir}/include/gtk2hs-config.h
-%{gtk2hsdir}/mogul.package.conf
-%{gtk2hsdir}/libHSmogul.a
-%ghost %{gtk2hsdir}/HSmogul.o
-%dir %{gtk2hsdir}/imports
-%{gtk2hsdir}/imports/mogul
+%{gtk2hsdir}/soegtk.package.conf
+%{gtk2hsdir}/libHSsoegtk.a
+%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/imports/soegtk
 %{gtk2hsdir}/sourceview.package.conf
 %{gtk2hsdir}/libHSsourceview.a
 %ghost %{gtk2hsdir}/HSsourceview.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/sourceview
 
 
@@ -261,12 +256,15 @@
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
-%dir %{gtk2hsdir}/imports
 %{gtk2hsdir}/imports/mozembed
 %endif
 
 
 %changelog
+* Thu Nov 16 2006 Jens Petersen <petersen at redhat.com> - 0.9.10.2-0.1
+- update to latest darcs snapshot for ghc66
+- add soegtk and remove mogul ghc packages
+
 * Thu Sep 28 2006 Jens Petersen <petersen at redhat.com> - 0.9.10-4
 - rebuild for FC6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 May 2006 03:18:55 -0000	1.2
+++ sources	16 Nov 2006 04:43:35 -0000	1.3
@@ -1 +1 @@
-13d300e07153f37ba5893ac336b078bc  gtk2hs-0.9.10.tar.gz
+58e4a880c36b217da6f4689ca3e20334  gtk2hs-0.9.10.2-20061116.tar.gz