rpms/ghc-gtk2hs/F-10 .cvsignore, 1.3, 1.4 ghc-gtk2hs.spec, 1.7, 1.8 sources, 1.3, 1.4
Jens Petersen
petersen at fedoraproject.org
Thu Feb 12 05:52:36 UTC 2009
- Previous message (by thread): rpms/perl-Algorithm-Dependency/F-9 .cvsignore, 1.7, 1.8 perl-Algorithm-Dependency.spec, 1.13, 1.14 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-Data-Compare/devel .cvsignore, 1.6, 1.7 perl-Data-Compare.spec, 1.9, 1.10 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/pkgs/rpms/ghc-gtk2hs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9665
Modified Files:
.cvsignore ghc-gtk2hs.spec sources
Log Message:
backport latest gtk2hs from rawhide:
* Thu Feb 12 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-1
- rebuild for official 0.10.0 release
* Sat Feb 7 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-0.1
- update to 0.10.0 prerelease
- adds .cabal files
- gstreamer, gio, gnomevfs are LGPLv3
- subpackage all the ghc packages
- add compat and common packages for upgrades
- gtksourceview2 replaces sourceview
- fix docs bcond, and add bcond for svgcairo, gio, gstreamer, prof, and gnomevfs
- build svgcairo and gstreamer
- use common_descr for descriptions
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 Nov 2008 03:59:42 -0000 1.3
+++ .cvsignore 12 Feb 2009 05:52:05 -0000 1.4
@@ -1 +1 @@
-gtk2hs-20081108.tar.gz
+gtk2hs-0.10.0.tar.gz
Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-10/ghc-gtk2hs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-gtk2hs.spec 6 Feb 2009 00:02:49 -0000 1.7
+++ ghc-gtk2hs.spec 12 Feb 2009 05:52:05 -0000 1.8
@@ -1,39 +1,48 @@
-%define snapdate 20081108
+#%%define snapdate 20090125
%define pkg_name gtk2hs
%define ghc_version 6.10.1
-%bcond_without prof
-%bcond_without doc
+%bcond_without docs
%bcond_without cairo
+%bcond_without svgcairo
+%bcond_without gio
%bcond_without opengl
+%bcond_without gstreamer
+%bcond_with prof
+%bcond_with gnomevfs
%bcond_with mozembed
%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}
+%define common_descr \
+A Gtk+ binding for the functional language Haskell featuring automatic memory\
+management, unicode support, and wide coverage of Gtk+ 2 widgets.
+
Summary: Haskell binding for gtk2 and related libraries
Name: ghc-gtk2hs
-Version: 0.9.13
-Release: 8%{?snapdate:.%{snapdate}}%{?dist}
+Version: 0.10.0
+Release: 1%{?snapdate:.%{snapdate}}%{?dist}
# cairo/ and svgcairo/ are FreeBSD
# compat/ is BSD
-# tools/c2hs (used to build) is GPL, LGPL
+# tools/c2hs (used to build) is GPLv2+, LGPLv2+
# except tools/c2hs/base/general/{Binary.hs,FastMutInt.hs} from ghc (BSD)
-# rest is all LGPL
-License: LGPLv2+
+# gstreamer, gio, gnomevfs are LGPLv3
+# 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}%{?snapdate:-%{snapdate}}.tar.gz
+Source: %{pkg_name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
%else
Source: http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.gz
%endif
URL: http://gtk2hs.sourceforge.net/
# we have only bootstrapped ghc on the following archs:
-ExclusiveArch: i386 x86_64 ppc
+ExclusiveArch: i386 i686 x86_64 ppc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ghc = %{ghc_version}
BuildRequires: happy, alex
@@ -41,37 +50,66 @@
BuildRequires: haddock >= 2.4.1
BuildRequires: ghc-doc = %{ghc_version}
%endif
+%if %{with prof}
+BuildRequires: ghc-prof = %{ghc_version}
+%endif
BuildRequires: gtk2-devel
-BuildRequires: gtksourceview-devel
+BuildRequires: gtksourceview2-devel
BuildRequires: libglade2-devel
BuildRequires: GConf2-devel, dbus-devel
+%if %{with gstreamer}
+BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel
+%endif
%if %{with mozembed}
BuildRequires: xulrunner-devel
%endif
%if %{with cairo}
BuildRequires: cairo-devel
+%if %{with svgcairo}
+BuildRequires: librsvg2-devel
+%endif
%endif
%if %{with opengl}
BuildRequires: gtkglext-devel
%endif
-Requires: ghc = %{ghc_version}
-Obsoletes: ghc661-%{pkg_name}, ghc682-%{pkg_name}
-Requires: gtk2-devel
-Requires: GConf2-devel
-Requires: libglade2-devel
-Requires: gtksourceview-devel
-Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
-Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
-Obsoletes: ghc661-%{pkg_name}-mozembed, ghc682-%{pkg_name}-mozembed
%description
-A Gtk+ binding for the functional language Haskell featuring automatic memory
-management, unicode support, and wide coverage of Gtk+ 2 widgets.
+%commom_descr
This package also includes the bindings for cairo, gconf, glade, glib, and
sourceview. The libraries are compiled for ghc-%{ghc_version}.
+# added for F11, can be dropped for F13
+%package compat
+Summary: Haskell Gtk+ GUI library backward compatibility
+Group: Development/Libraries
+# ditto
+Provides: %{name} = %{version}-%{release}
+Obsoletes: %{name} < 0.10.0
+# ghc682 is from f8
+Obsoletes: ghc661-%{pkg_name}, ghc682-%{pkg_name}
+Obsoletes: ghc661-%{pkg_name}-mozembed, ghc682-%{pkg_name}-mozembed
+Requires: ghc-soegtk = %{version}-%{release}
+Requires: ghc-glade = %{version}-%{release}
+Requires: ghc-gconf = %{version}-%{release}
+
+%description compat
+%common_descr
+
+This package obsoletes the former ghc-gtk2hs package and can safely be removed.
+
+
+%package common
+Summary: Haskell Gtk+ GUI library common files
+Group: Development/Libraries
+
+%description common
+%common_descr
+
+This package contains some common files shared by the subpackages.
+
+
%if %{with docs}
%package doc
Summary: Haskell Gtk+ GUI library documentation
@@ -79,42 +117,68 @@
Obsoletes: gtk2hs-doc < 0.9.13-3
%description doc
-A Gtk+ binding for the functional language Haskell featuring automatic
-memory management, unicode support, and wide coverage of Gtk+ 2
-widgets.
+%common_descr
This package contains the gtk2hs documentation.
%endif
-%if %{with opengl}
-%package gtkglext
-Summary: Haskell binding for gtkglext
-Group: Development/Libraries
-Requires: ghc = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
-Requires: gtkglext-devel
-Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
-Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
-%description gtkglext
-A Haskell binding of GtkGlExt for gtk2hs.
+# subpackage name lib [dep] [obsoletes]
+%define subpackage()\
+%package -n ghc-%1\
+Summary: Haskell binding for %1\
+Group: Development/Libraries\
+Requires: ghc = %{ghc_version}\
+Requires: %{name}-common = %{version}-%{release}\
+Requires: %2-devel, %{?3:ghc-%3 = %{version}-%{release}}\
+Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\
+Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\
+%{?4:Obsoletes: %4 < 0.10.0}\
+\
+%description -n ghc-%1\
+%common_descr\
+\
+This package contains a Haskell binding of the %1 library.\
+\
+%post -n ghc-%1\
+ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \
+\
+%preun -n ghc-%1\
+if [ "$1" = 0 ]; then\
+ ghc-pkg-%{ghc_version} unregister %1-%{version} &>/dev/null || : \
+fi\
+\
+%files -n ghc-%1\
+%{pkg_libdir}/%1.cabal\
+%{pkg_libdir}/%1.package.conf\
+%{pkg_libdir}/libHS%1.a\
+%{pkg_libdir}/HS%1.o\
+%{pkg_libdir}/imports/%1
+
+
+%subpackage cairo cairo glib
+%subpackage gconf GConf2 glib
+%if %{with gio}
+%subpackage gio glib2 glib
+%endif
+%subpackage glade libglade2 gtk
+%subpackage glib glib2
+%if %{with gnomevfs}
+%subpackage gnomevfs gnomevfs glib
%endif
-
-
+%if %{with gstreamer}
+%subpackage gstreamer gstreamer glib
+%endif
+%subpackage gtk gtk2 cairo
+%if %{with opengl}
+%subpackage gtkglext gtkglext gtk ghc-gtk2hs-gtkglext
+%endif
+%subpackage gtksourceview2 gtksourceview2 gtk
%if %{with mozembed}
-%package mozembed
-Summary: Haskell binding for gtkembedmoz
-Group: Development/Libraries
-Requires: ghc = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
-Requires: firefox-devel
-Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}
-Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}
-
-%description mozembed
-A Haskell binding of GtkEmbedMoz for gtk2hs.
+%subpackage mozembed xulrunner gtk
%endif
-
+%subpackage soegtk gtk2 gtk
+%subpackage svgcairo librsvg2 cairo
# the debuginfo subpackage is currently empty anyway, so don't generate it
%define debug_package %{nil}
@@ -122,12 +186,13 @@
%prep
%if %{?snapdate:1}0
-%setup -q -n %{pkg_name}-%{snapdate}
+%setup -q -n %{pkg_name}-%{version}-%{snapdate}
%else
%setup -q -n %{pkg_name}-%{version}
%endif
%{?snapdate:autoreconf}
+
%build
%if %{with docs}
export HADDOCK=%{_bindir}/haddock-2.4.1
@@ -138,13 +203,15 @@
%if %{with docs}
--enable-docs \
%endif
-%if 0
- --enable-gio \
+%if %{with prof}
+ --enable-profiling \
%endif
+ --enable-gio \
--enable-gtk \
--enable-libglade \
--enable-gconf \
- --enable-sourceview \
+ --enable-gstreamer \
+ --enable-gtksourceview2 \
%if %{with mozembed}
--enable-xulrunner \
%endif
@@ -152,8 +219,12 @@
--enable-opengl \
%endif
%if %{with cairo}
- --enable-cairo
+ --enable-cairo \
+%if %{with svgcairo}
+ --enable-svg \
%endif
+%endif
+%{nil}
# C locale to workaround c2hs failing in CJK locale
LANG=C make all pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
@@ -163,59 +234,11 @@
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
-# install .o files
-for i in gconf glade glib gtk sourceview soegtk \
-%if %{with cairo}
- cairo \
-%endif
-%if %{with mozembed}
- mozembed \
-%endif
- ; do
- install --mode=0644 -p HS${i}.o %{buildroot}%{pkg_libdir}
-done
-
%clean
rm -rf %{buildroot}
-%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
-for i in glib \
-%if %{with cairo}
- cairo \
-%endif
- gtk \
- gconf \
- glade \
- sourceview \
- soegtk \
-; do
-%{ghcpkg_inst $i}
-done
-
-%preun
-if [ "$1" = 0 ]; then
- for i in \
- soegtk \
- gconf \
- glade \
- sourceview \
- gtk \
-%if %{with cairo}
- cairo \
-%endif
- glib \
-; do
-%{ghcpkg_uninst $i}
-done
-fi
-
%if %{with docs}
%post doc
%ghc_reindex_haddock
@@ -224,64 +247,18 @@
%ghc_reindex_haddock
%endif
-%if %{with mozembed}
-%post mozembed
-%{ghcpkg_inst mozembed}
-
-%preun mozembed
-if [ "$1" = 0 ]; then
- %{ghcpkg_uninst mozembed}
-fi
-%endif
-
-%if %{with opengl}
-%post gtkglext
-%{ghcpkg_inst gtkglext}
-%preun gtkglext
-if [ "$1" = 0 ]; then
- %{ghcpkg_uninst gtkglext}
-fi
-%endif
+%files compat
+%defattr(-,root,root,-)
-%files
+%files common
%defattr(-,root,root,-)
-%doc AUTHORS COPYING
+%doc AUTHORS COPYING*
%dir %{pkg_libdir}
-%{pkg_libdir}/gtk.package.conf
-%{pkg_libdir}/libHSgtk.a
-%{pkg_libdir}/HSgtk.o
%dir %{pkg_libdir}/imports
-%{pkg_libdir}/imports/gtk
-%if %{with cairo}
-%{pkg_libdir}/cairo.package.conf
-%{pkg_libdir}/libHScairo.a
-%{pkg_libdir}/HScairo.o
-%{pkg_libdir}/imports/cairo
-%endif
-%{pkg_libdir}/gconf.package.conf
-%{pkg_libdir}/libHSgconf.a
-%{pkg_libdir}/HSgconf.o
-%{pkg_libdir}/imports/gconf
-%{pkg_libdir}/glade.package.conf
-%{pkg_libdir}/libHSglade.a
-%{pkg_libdir}/HSglade.o
-%{pkg_libdir}/imports/glade
-%{pkg_libdir}/glib.package.conf
-%{pkg_libdir}/libHSglib.a
-%{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
-%{pkg_libdir}/HSsoegtk.o
-%{pkg_libdir}/imports/soegtk
-%{pkg_libdir}/sourceview.package.conf
-%{pkg_libdir}/libHSsourceview.a
-%{pkg_libdir}/HSsourceview.o
-%{pkg_libdir}/imports/sourceview
%if %{with docs}
@@ -292,27 +269,21 @@
%endif
-%if %{with mozembed}
-%files mozembed
-%defattr(-,root,root,-)
-%{pkg_libdir}/mozembed.package.conf
-%{pkg_libdir}/libHSmozembed.a
-%{pkg_libdir}/HSmozembed.o
-%{pkg_libdir}/imports/mozembed
-%endif
-
-
-%if %{with opengl}
-%files gtkglext
-%defattr(-,root,root,-)
-%{pkg_libdir}/gtkglext.package.conf
-%{pkg_libdir}/libHSgtkglext.a
-%{pkg_libdir}/HSgtkglext.o
-%{pkg_libdir}/imports/gtkglext
-%endif
+%changelog
+* Thu Feb 12 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-1
+- rebuild for official 0.10.0 release
+* Sat Feb 7 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-0.1
+- update to 0.10.0 prerelease
+- adds .cabal files
+- gstreamer, gio, gnomevfs are LGPLv3
+- subpackage all the ghc packages
+- add compat and common packages for upgrades
+- gtksourceview2 replaces sourceview
+- fix docs bcond, and add bcond for svgcairo, gio, gstreamer, prof, and gnomevfs
+- build svgcairo and gstreamer
+- use common_descr for descriptions
-%changelog
* Fri Feb 6 2009 Jens Petersen <petersen at redhat.com> - 0.9.13-8.20081108
- use bcond
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 Nov 2008 03:59:42 -0000 1.3
+++ sources 12 Feb 2009 05:52:05 -0000 1.4
@@ -1 +1 @@
-a6a7bb2362ec3ed31696330368653fe3 gtk2hs-20081108.tar.gz
+08df47256cbcd5668e82b9f8beb621ab gtk2hs-0.10.0.tar.gz
- Previous message (by thread): rpms/perl-Algorithm-Dependency/F-9 .cvsignore, 1.7, 1.8 perl-Algorithm-Dependency.spec, 1.13, 1.14 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-Data-Compare/devel .cvsignore, 1.6, 1.7 perl-Data-Compare.spec, 1.9, 1.10 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list