rpms/gtk2hs/devel gtk2hs.spec,1.24,1.25
Bryan O'Sullivan (bos)
fedora-extras-commits at redhat.com
Tue Oct 9 06:36:22 UTC 2007
Author: bos
Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22228
Modified Files:
gtk2hs.spec
Log Message:
Enable some new modules, improve build dependencies.
Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gtk2hs.spec 9 Oct 2007 00:03:46 -0000 1.24
+++ gtk2hs.spec 9 Oct 2007 06:35:48 -0000 1.25
@@ -10,7 +10,7 @@
Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
Name: gtk2hs
Version: 0.9.12%{?snapdate:.%{snapdate}}
-Release: 3%{?dist}
+Release: 4%{?dist}
# cairo/ and svgcairo/ are FreeBSD
# compat/ is BSD
# tools/c2hs (used to build) is GPL, LGPL
@@ -23,19 +23,21 @@
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
ExcludeArch: ppc64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ghc = %{ghc_version}
-BuildRequires: haddock
-BuildRequires: gtk2-devel
-BuildRequires: gtksourceview-devel
-BuildRequires: libglade2-devel
-BuildRequires: GConf2-devel
+BuildRequires: alex
+BuildRequires: GConf2-devel
+BuildRequires: ghc = %{ghc_version}
+BuildRequires: gtk2-devel
+BuildRequires: gtksourceview-devel
+BuildRequires: haddock
+BuildRequires: happy
+BuildRequires: libglade2-devel
%if %{build_mozembed}
-BuildRequires: firefox-devel
+BuildRequires: firefox-devel
%endif
%if %{build_cairo}
-BuildRequires: cairo-devel
+BuildRequires: cairo-devel
+BuildRequires: librsvg2-devel
%endif
-Patch1: gtk2hs-gtype-cuint.patch
%description
A Gtk+ binding for the functional language Haskell featuring
@@ -58,15 +60,22 @@
%package -n %{ghcver}-%{name}
Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
Group: Development/Libraries
+Requires: %{_bindir}/ghc-pkg-%{ghc_version}
+Requires: GConf2-devel
Requires: %{ghcver}
Requires: gtk2-devel
-Requires: GConf2-devel
-Requires: libglade2-devel
Requires: gtksourceview-devel
-PreReq: %{_bindir}/ghc-pkg-%{ghc_version}
+Requires: libglade2-devel
%if !%{build_mozembed}
Obsoletes: %{ghcver}-%{name}-mozembed < %{version}-%{release}
%endif
+%if %{build_mozembed}
+Requires: firefox-devel
+%endif
+%if %{build_cairo}
+Requires: cairo-devel
+Requires: librsvg2-devel
+%endif
%description -n %{ghcver}-%{name}
A Gtk+ binding for the functional language Haskell featuring automatic memory
@@ -112,15 +121,21 @@
%prep
%setup -q %{?snapdate:-n %{name}-%{version}}
-%patch1 -p1 -b .orig-1
%build
+cd ..
+rm -rf gtk2hs-0.9.12.20071008
+cp -al gtk2hs-0.9.12.20071008.good gtk2hs-0.9.12.20071008
+cd gtk2hs-0.9.12.20071008
+exit 0
+test -f configure || autoreconf
+# gstreamer disabled for now due to compilation failure
%configure \
--with-hc=ghc-%{ghc_version} \
--prefix=%{_prefix} \
--libdir=%{ghclibdir} \
+ --disable-dependency-tracking \
--enable-packager-mode \
- --enable-docs \
--enable-libglade \
--enable-gconf \
--enable-sourceview \
@@ -128,8 +143,12 @@
--enable-firefox \
%endif
%if %{build_cairo}
- --enable-cairo
+ --enable-cairo \
+ --enable-svg \
%endif
+ --enable-opengl \
+ --enable-gnomevfs \
+ --enable-docs
# C locale to workaround c2hs failing in CJK locale
LANG=C make all
@@ -168,12 +187,16 @@
for i in glib \
%if %{build_cairo}
cairo \
+ svgcairo \
%endif
- gtk \
gconf \
glade \
- sourceview \
+ glib \
+ gnomevfs \
+ gtk \
+ gtkglext \
soegtk \
+ sourceview \
; do
%{ghcpkg_inst $i}
done
@@ -188,15 +211,18 @@
%preun -n %{ghcver}-%{name}
if [ "$1" = 0 ]; then
for i in \
- soegtk \
gconf \
glade \
- sourceview \
+ glib \
+ gnomevfs \
gtk \
+ gtkglext \
+ soegtk \
+ sourceview \
%if %{build_cairo}
cairo \
+ svgcairo \
%endif
- glib \
; do
%{ghcpkg_uninst $i}
done
@@ -221,39 +247,61 @@
%dir %{_libdir}/ghc
%dir %{ghclibdir}
%dir %{gtk2hsdir}
-%{gtk2hsdir}/gtk.package.conf
-%{gtk2hsdir}/libHSgtk.a
-%ghost %{gtk2hsdir}/HSgtk.o
+%dir %{gtk2hsdir}/include
%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/include/gtk2hs-config.h
+
+%ghost %{gtk2hsdir}/HSgtk.o
+%{gtk2hsdir}/gtk.package.conf
%{gtk2hsdir}/imports/gtk
+%{gtk2hsdir}/libHSgtk.a
+
%if %{build_cairo}
+%ghost %{gtk2hsdir}/HScairo.o
%{gtk2hsdir}/cairo.package.conf
%{gtk2hsdir}/libHScairo.a
-%ghost %{gtk2hsdir}/HScairo.o
%{gtk2hsdir}/imports/cairo
+
+%ghost %{gtk2hsdir}/HSsvgcairo.o
+%{gtk2hsdir}/svgcairo.package.conf
+%{gtk2hsdir}/libHSsvgcairo.a
+%{gtk2hsdir}/imports/svgcairo
%endif
-%{gtk2hsdir}/gconf.package.conf
-%{gtk2hsdir}/libHSgconf.a
+
%ghost %{gtk2hsdir}/HSgconf.o
+%{gtk2hsdir}/gconf.package.conf
%{gtk2hsdir}/imports/gconf
-%{gtk2hsdir}/glade.package.conf
-%{gtk2hsdir}/libHSglade.a
+%{gtk2hsdir}/libHSgconf.a
+
%ghost %{gtk2hsdir}/HSglade.o
+%{gtk2hsdir}/glade.package.conf
%{gtk2hsdir}/imports/glade
-%{gtk2hsdir}/glib.package.conf
-%{gtk2hsdir}/libHSglib.a
+%{gtk2hsdir}/libHSglade.a
+
%ghost %{gtk2hsdir}/HSglib.o
+%{gtk2hsdir}/glib.package.conf
%{gtk2hsdir}/imports/glib
-%dir %{gtk2hsdir}/include
-%{gtk2hsdir}/include/gtk2hs-config.h
-%{gtk2hsdir}/soegtk.package.conf
-%{gtk2hsdir}/libHSsoegtk.a
+%{gtk2hsdir}/libHSglib.a
+
%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/soegtk.package.conf
%{gtk2hsdir}/imports/soegtk
-%{gtk2hsdir}/sourceview.package.conf
-%{gtk2hsdir}/libHSsourceview.a
+%{gtk2hsdir}/libHSsoegtk.a
+
%ghost %{gtk2hsdir}/HSsourceview.o
+%{gtk2hsdir}/sourceview.package.conf
%{gtk2hsdir}/imports/sourceview
+%{gtk2hsdir}/libHSsourceview.a
+
+%ghost %{gtk2hsdir}/HSgnomevfs.o
+%{gtk2hsdir}/gnomevfs.package.conf
+%{gtk2hsdir}/imports/gnomevfs
+%{gtk2hsdir}/libHSgnomevfs.a
+
+%ghost %{gtk2hsdir}/HSgtkglext.o
+%{gtk2hsdir}/gtkglext.package.conf
+%{gtk2hsdir}/imports/gtkglext
+%{gtk2hsdir}/libHSgtkglext.a
%files doc
@@ -273,6 +321,10 @@
%changelog
* Mon Oct 08 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.20070810-3
+- Enable more modules: gtkglext, gnomevfs, svgcairo
+- Fix a few remaining build problems
+
+* Mon Oct 08 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.20070810-3
- Update version of GHC used
* Mon Oct 08 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.20070810-2
More information about the fedora-extras-commits
mailing list