rpms/gtk2hs/devel gtk2hs.spec,1.36,1.37

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19352

Modified Files:
	gtk2hs.spec 
Log Message:
- build with ghc-6.8.3
- use haddock09 to fix build failure (#440493)
- merge ghcver subpackage into ghc subpackage in line with ghc
- obsolete old ghcver packages



Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/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	23 Jun 2008 00:19:08 -0000	1.37
@@ -1,8 +1,7 @@
 #%%define snapdate 20061116
 
 %define pkgname gtk
-%define ghc_version 6.8.2
-%define ghcver ghc682
+%define ghc_version 6.8.3
 
 %define build_mozembed 0
 %define build_cairo 1
@@ -10,7 +9,7 @@
 Summary:        A Haskell GUI library based on the Gtk+ GUI toolkit
 Name:           gtk2hs
 Version:        0.9.12.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 # cairo/ and svgcairo/ are FreeBSD
 # compat/ is BSD
 # tools/c2hs (used to build) is GPL, LGPL
@@ -24,7 +23,7 @@
 ExcludeArch:	alpha ppc64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc = %{ghc_version}
-BuildRequires:  haddock
+BuildRequires:  haddock09
 BuildRequires:  gtk2-devel
 BuildRequires:  gtksourceview-devel
 BuildRequires:  libglade2-devel
@@ -46,28 +45,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.
 
@@ -88,15 +75,15 @@
 
 
 %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}
 
-%description -n %{ghcver}-%{name}-mozembed
+%description -n ghc-%{name}-mozembed
 A Haskell binding of GtkEmbedMoz for gtk2hs.
 %endif
 
@@ -163,7 +150,7 @@
 %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 \
@@ -179,12 +166,12 @@
 
 
 %if %{build_mozembed}
-%post -n %{ghcver}-%{name}-mozembed
+%post -n ghc-%{name}-mozembed
 %{ghcpkg_inst mozembed}
 %endif
 
 
-%preun -n %{ghcver}-%{name}
+%preun -n ghc-%{name}
 if [ "$1" = 0 ]; then
   for i in \
 	soegtk \
@@ -203,7 +190,7 @@
 
 
 %if %{build_mozembed}
-%preun -n %{ghcver}-%{name}-mozembed
+%preun -n ghc-%{name}-mozembed
 if [ "$1" = 0 ]; then
   %{ghcpkg_uninst mozembed}
 fi
@@ -212,10 +199,6 @@
 
 %files -n ghc-%{name}
 %defattr(-,root,root)
-
-
-%files -n %{ghcver}-%{name}
-%defattr(-,root,root)
 %doc AUTHORS COPYING
 %dir %{_libdir}/ghc
 %dir %{ghclibdir}
@@ -262,7 +245,7 @@
 
 
 %if %{build_mozembed}
-%files -n %{ghcver}-%{name}-mozembed
+%files -n ghc-%{name}-mozembed
 %{gtk2hsdir}/mozembed.package.conf
 %{gtk2hsdir}/libHSmozembed.a
 %ghost %{gtk2hsdir}/HSmozembed.o
@@ -271,6 +254,11 @@
 
 
 %changelog
+* Mon Jun 23 2008 Jens Petersen <petersen at redhat.com> - 0.9.12.1-10.fc10
+- use haddock09 to fix build failure (#440493)
+- merge ghcver subpackage into ghc subpackage in line with ghc
+- obsolete old ghcver packages
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.12.1-9
 - Autorebuild for GCC 4.3