rpms/gtk2hs/F-9 gtk2hs-fasm-0.9.13.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 gtk2hs.spec, 1.36, 1.37 sources, 1.11, 1.12 gtk2hs-gtype-cuint.patch, 1.1, NONE

Tue Nov 11 01:41:58 UTC 2008

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14399

Modified Files:
	.cvsignore gtk2hs.spec sources 
Added Files:
	gtk2hs-fasm-0.9.13.patch 
Removed Files:
	gtk2hs-gtype-cuint.patch 
Log Message:
backport F10 to F9 for update to ghc-6.8.3

gtk2hs-fasm-0.9.13.patch:

--- NEW FILE gtk2hs-fasm-0.9.13.patch ---
--- gtk2hs-0.9.13/Makefile.am.orig	2008-07-14 07:06:04.000000000 -0700
+++ gtk2hs-0.9.13/Makefile.am	2008-07-14 07:06:05.000000000 -0700
@@ -217,7 +217,7 @@
 tools_c2hs_base_general_Binary_hs_HCFLAGS = -O -funbox-strict-fields
 tools_c2hs_base_general_FastMutInt_hs_HCFLAGS = -O
 tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts
-tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \
+tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi \
 	'-\#include<c2hs_config.h>'
 
 tools/c2hs/c/CLexer.hs : tools/c2hs/c/CLexer.x


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Nov 2007 23:33:31 -0000	1.9
+++ .cvsignore	11 Nov 2008 01:41:28 -0000	1.10
@@ -1 +1 @@
-gtk2hs-0.9.12.1.tar.gz
+gtk2hs-0.9.13.tar.gz


Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/F-9/gtk2hs.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gtk2hs.spec	18 Feb 2008 21:24:50 -0000	1.36
+++ gtk2hs.spec	11 Nov 2008 01:41:28 -0000	1.37
@@ -1,16 +1,20 @@
 #%%define snapdate 20061116
 
-%define pkgname gtk
-%define ghc_version 6.8.2
-%define ghcver ghc682
+%define pkg_name gtk2hs
+%define ghc_version 6.8.3
 
+%define build_docs 1
 %define build_mozembed 0
 %define build_cairo 1
+%define build_opengl 1
+
+%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
+%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}
 
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
-Version:        0.9.12.1
-Release:        9%{?dist}
+Version:        0.9.13
+Release:        3%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -19,22 +23,28 @@
 License:        LGPLv2+
 Group:          Development/Libraries
 Source:         http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
+Patch0:         gtk2hs-fasm-0.9.13.patch
 URL:            http://gtk2hs.sourceforge.net/
 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
 ExcludeArch:	alpha ppc64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
-BuildRequires:  haddock
+%if %{build_docs}
+BuildRequires:  haddock09
+%endif
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  GConf2-devel
 %if %{build_mozembed}
-BuildRequires:  firefox-devel
+BuildRequires:  xulrunner-devel
 %endif
 %if %{build_cairo}
 BuildRequires:  cairo-devel
 %endif
+%if %{build_opengl}
+BuildRequires:  gtkglext-devel
+%endif
 
 %description
 A Gtk+ binding for the functional language Haskell featuring
@@ -46,28 +56,16 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Group:          Development/Libraries
 Requires:       ghc = %{ghc_version}
-Requires:       %{ghcver}-%{name} = %{version}-%{release}
-
-%description -n ghc-%{name}
-A Gtk+ binding for the functional language Haskell featuring
-automatic memory management, unicode support, and wide
-coverage of Gtk+ 2 widgets.
-
-
-%package -n %{ghcver}-%{name}
-Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
-Group:          Development/Libraries
-Requires:       %{ghcver}
+Obsoletes:      ghc661-%{name}, ghc682-%{name}
 Requires:       gtk2-devel
 Requires:       GConf2-devel
 Requires:       libglade2-devel
 Requires:       gtksourceview-devel
-PreReq:         %{_bindir}/ghc-pkg-%{ghc_version}
-%if !%{build_mozembed}
-Obsoletes:      %{ghcver}-%{name}-mozembed < %{version}-%{release}
-%endif
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
+Obsoletes:      ghc661-%{name}-mozembed, ghc682-%{name}-mozembed
 
-%description -n %{ghcver}-%{name}
+%description -n ghc-%{name}
 A Gtk+ binding for the functional language Haskell featuring automatic memory
 management, unicode support, and wide coverage of Gtk+ 2 widgets.
 
@@ -75,68 +73,90 @@
 sourceview.  The libraries are compiled for ghc-%{ghc_version}.
 
 
-%package doc
+%if %{build_docs}
+%package -n ghc-%{name}-doc
 Summary:        Haskell Gtk+ GUI library documentation
 Group:          Development/Libraries
+Obsoletes:      gtk2hs-doc < 0.9.13-3
 
-%description doc
+%description -n ghc-%{name}-doc
 A Gtk+ binding for the functional language Haskell featuring automatic
 memory management, unicode support, and wide coverage of Gtk+ 2
 widgets.
 
 This package contains the gtk2hs documentation.
+%endif
+
+%if %{build_opengl}
+%package -n ghc-%{name}-gtkglext
+Summary:        Haskell binding for gtkglext
+Group:          Development/Libraries
+Requires:       ghc = %{ghc_version}
+Requires:       ghc-%{name} = %{version}-%{release}
+Requires:       gtkglext
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
+
+%description -n ghc-%{name}-gtkglext
+A Haskell binding of GtkGlExt for gtk2hs.
+%endif
 
 
 %if %{build_mozembed}
-%package -n %{ghcver}-%{name}-mozembed
+%package -n ghc-%{name}-mozembed
 Summary:        Haskell binding for gtkembedmoz
 Group:          Development/Libraries
-Requires:       %{ghcver}
-Requires:       %{ghcver}-%{name} = %{version}-%{release}
+Requires:       ghc = %{ghc_version}
+Requires:       ghc-%{name} = %{version}-%{release}
 Requires:       firefox-devel
-PreReq:         %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
-%description -n %{ghcver}-%{name}-mozembed
+%description -n ghc-%{name}-mozembed
 A Haskell binding of GtkEmbedMoz for gtk2hs.
 %endif
 
 
 # the debuginfo subpackage is currently empty anyway, so don't generate it
 %define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
-
-%define ghclibdir %{_libdir}/ghc/%{ghc_version}
-%define gtk2hsdir %{ghclibdir}/%{name}
 
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}}
-
+%ifarch ppc
+%patch0 -p1 -b .0-fasm-ppc~
+%endif
 
 %build
+%if %{build_docs}
+export HADDOCK=%{_bindir}/haddock-0.9
+%endif
 %configure \
         --with-hc=ghc-%{ghc_version} \
-        --prefix=%{_prefix} \
-        --libdir=%{ghclibdir} \
         --enable-packager-mode \
+%if %{build_docs}
         --enable-docs \
+%endif
         --enable-libglade \
         --enable-gconf \
         --enable-sourceview \
 %if %{build_mozembed}
         --enable-firefox \
 %endif
+%if %{build_opengl}
+        --enable-opengl \
+%endif
 %if %{build_cairo}
         --enable-cairo
 %endif
 
 # C locale to workaround c2hs failing in CJK locale
-LANG=C make all
+LANG=C make all pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
 
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
 
 # make ghost files
 for i in gconf glade glib gtk sourceview soegtk \
@@ -147,23 +167,20 @@
         mozembed \
 %endif
         ; do
-  touch %{buildroot}%{gtk2hsdir}/HS${i}.o
+  touch %{buildroot}%{pkg_libdir}/HS${i}.o
 done
 
-# remove installed docdir files
-rm -rf %{buildroot}%{_defaultdocdir}/%{name}
-
 
 %clean
 rm -rf %{buildroot}
 
 
-%define ghcpkg_inst() ghc-pkg-%{ghc_version} update --auto-ghci-libs  %{gtk2hsdir}/%{1}.package.conf &>/dev/null
+%define ghcpkg_inst() ghc-pkg-%{ghc_version} update --auto-ghci-libs  %{pkg_libdir}/%{1}.package.conf &>/dev/null
 
 %define ghcpkg_uninst() ghc-pkg-%{ghc_version} unregister %{1} &>/dev/null || :
 
 
-%post -n %{ghcver}-%{name}
+%post -n ghc-%{name}
 for i in glib \
 %if %{build_cairo}
         cairo \
@@ -177,14 +194,7 @@
 %{ghcpkg_inst $i}
 done
 
-
-%if %{build_mozembed}
-%post -n %{ghcver}-%{name}-mozembed
-%{ghcpkg_inst mozembed}
-%endif
-
-
-%preun -n %{ghcver}-%{name}
+%preun -n ghc-%{name}
 if [ "$1" = 0 ]; then
   for i in \
 	soegtk \
@@ -201,76 +211,125 @@
 done
 fi
 
+%if %{build_docs}
+%post -n ghc-%{name}-doc
+%ghc_reindex_haddock
+
+%postun -n ghc-%{name}-doc
+%ghc_reindex_haddock
+%endif
 
 %if %{build_mozembed}
-%preun -n %{ghcver}-%{name}-mozembed
+%post -n ghc-%{name}-mozembed
+%{ghcpkg_inst mozembed}
+
+%preun -n ghc-%{name}-mozembed
 if [ "$1" = 0 ]; then
   %{ghcpkg_uninst mozembed}
 fi
 %endif
 
+%if %{build_opengl}
+%post -n ghc-%{name}-gtkglext
+%{ghcpkg_inst gtkglext}
 
-%files -n ghc-%{name}
-%defattr(-,root,root)
+%preun -n ghc-%{name}-gtkglext
+if [ "$1" = 0 ]; then
+  %{ghcpkg_uninst gtkglext}
+fi
+%endif
 
 
-%files -n %{ghcver}-%{name}
-%defattr(-,root,root)
+%files -n ghc-%{name}
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%dir %{_libdir}/ghc
-%dir %{ghclibdir}
-%dir %{gtk2hsdir}
-%{gtk2hsdir}/gtk.package.conf
-%{gtk2hsdir}/libHSgtk.a
-%ghost %{gtk2hsdir}/HSgtk.o
-%dir %{gtk2hsdir}/imports
-%{gtk2hsdir}/imports/gtk
+%dir %{pkg_libdir}
+%{pkg_libdir}/gtk.package.conf
+%{pkg_libdir}/libHSgtk.a
+%ghost %{pkg_libdir}/HSgtk.o
+%dir %{pkg_libdir}/imports
+%{pkg_libdir}/imports/gtk
 %if %{build_cairo}
-%{gtk2hsdir}/cairo.package.conf
-%{gtk2hsdir}/libHScairo.a
-%ghost %{gtk2hsdir}/HScairo.o
-%{gtk2hsdir}/imports/cairo
-%endif
-%{gtk2hsdir}/gconf.package.conf
-%{gtk2hsdir}/libHSgconf.a
-%ghost %{gtk2hsdir}/HSgconf.o
-%{gtk2hsdir}/imports/gconf
-%{gtk2hsdir}/glade.package.conf
-%{gtk2hsdir}/libHSglade.a
-%ghost %{gtk2hsdir}/HSglade.o
-%{gtk2hsdir}/imports/glade
-%{gtk2hsdir}/glib.package.conf
-%{gtk2hsdir}/libHSglib.a
-%ghost %{gtk2hsdir}/HSglib.o
-%{gtk2hsdir}/imports/glib
-%dir %{gtk2hsdir}/include
-%{gtk2hsdir}/include/gtk2hs-config.h
-%{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
-%{gtk2hsdir}/imports/sourceview
-
-
-%files doc
-%defattr(-,root,root)
-%doc docs/reference
+%{pkg_libdir}/cairo.package.conf
+%{pkg_libdir}/libHScairo.a
+%ghost %{pkg_libdir}/HScairo.o
+%{pkg_libdir}/imports/cairo
+%endif
+%{pkg_libdir}/gconf.package.conf
+%{pkg_libdir}/libHSgconf.a
+%ghost %{pkg_libdir}/HSgconf.o
+%{pkg_libdir}/imports/gconf
+%{pkg_libdir}/glade.package.conf
+%{pkg_libdir}/libHSglade.a
+%ghost %{pkg_libdir}/HSglade.o
+%{pkg_libdir}/imports/glade
+%{pkg_libdir}/glib.package.conf
+%{pkg_libdir}/libHSglib.a
+%ghost %{pkg_libdir}/HSglib.o
+%{pkg_libdir}/imports/glib
+%dir %{pkg_libdir}/include
+%{pkg_libdir}/include/gtk2hs-config.h
+%{pkg_libdir}/soegtk.package.conf
+%{pkg_libdir}/libHSsoegtk.a
+%ghost %{pkg_libdir}/HSsoegtk.o
+%{pkg_libdir}/imports/soegtk
+%{pkg_libdir}/sourceview.package.conf
+%{pkg_libdir}/libHSsourceview.a
+%ghost %{pkg_libdir}/HSsourceview.o
+%{pkg_libdir}/imports/sourceview
+
+
+%if %{build_docs}
+%files -n ghc-%{name}-doc
+%defattr(-,root,root,-)
 %doc ChangeLog TODO demo
+%{pkg_docdir}
+%endif
 
 
 %if %{build_mozembed}
-%files -n %{ghcver}-%{name}-mozembed
-%{gtk2hsdir}/mozembed.package.conf
-%{gtk2hsdir}/libHSmozembed.a
-%ghost %{gtk2hsdir}/HSmozembed.o
-%{gtk2hsdir}/imports/mozembed
+%files -n ghc-%{name}-mozembed
+%defattr(-,root,root,-)
+%{pkg_libdir}/mozembed.package.conf
+%{pkg_libdir}/libHSmozembed.a
+%ghost %{pkg_libdir}/HSmozembed.o
+%{pkg_libdir}/imports/mozembed
+%endif
+
+
+%if %{build_opengl}
+%files -n ghc-%{name}-gtkglext
+%defattr(-,root,root,-)
+%{pkg_libdir}/gtkglext.package.conf
+%{pkg_libdir}/libHSgtkglext.a
+%ghost %{pkg_libdir}/HSgtkglext.o
+%{pkg_libdir}/imports/gtkglext
 %endif
 
 
 %changelog
+* Fri Oct 24 2008 Jens Petersen <petersen at redhat.com> - 0.9.13-3
+- install docs in ghc haddock dir with htmldocdir and use ghc_reindex_haddock
+- rename gtk2hs-doc to ghc-gtk2hs-doc
+- use pkg_name, pkg_libdir, and pkg_docdir for Haskell packaging guidelines
+- don't override __spec_install_post
+
+* Mon Jul 14 2008 Bryan O'Sullivan <bos at serpentine.com> - 0.9.13-2
+- Try to fix ppc build due to ghc 6.8.3 -fvia-C bug
+
+* Mon Jul 14 2008 Bryan O'Sullivan <bos at serpentine.com> - 0.9.13-1
+- Update to 0.9.13
+
+* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 0.9.12.1-10.fc10
+- build with ghc-6.8.3
+- add build_docs switch
+- use haddock09 to fix build failure (#440493)
+- merge ghcver subpackage into ghc subpackage in line with ghc
+- obsolete old ghcver packages
+- add opengl gtkglext subpackage (Ian Collier, #327541)
+- require xulrunner-devel instead of firefox-devel
+- update prereq's to script requires
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.12.1-9
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Nov 2007 23:33:31 -0000	1.11
+++ sources	11 Nov 2008 01:41:28 -0000	1.12
@@ -1 +1 @@
-c82f9de1b47f93ab81ff41c5fe39ecb0  gtk2hs-0.9.12.1.tar.gz
+130a13b0cbbf1ab933583f33cae16f7e  gtk2hs-0.9.13.tar.gz


--- gtk2hs-gtype-cuint.patch DELETED ---


