rpms/gtk2hs/devel gtk2hs.spec,1.31,1.32
Bryan O'Sullivan (bos)
fedora-extras-commits at redhat.com
Wed Nov 7 17:48:25 UTC 2007
Author: bos
Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22971
Modified Files:
gtk2hs.spec
Log Message:
Revert to 0.9.12 spec file
Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gtk2hs.spec 7 Nov 2007 17:12:33 -0000 1.31
+++ gtk2hs.spec 7 Nov 2007 17:47:52 -0000 1.32
@@ -1,4 +1,4 @@
-# define snapdate 20071008
+#%%define snapdate 20061116
%define pkgname gtk
%define ghc_version 6.8.1
@@ -9,8 +9,8 @@
Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
Name: gtk2hs
-Version: 0.9.12.1%{?snapdate:.%{snapdate}}
-Release: 3%{?dist}
+Version: 0.9.12.1
+Release: 4%{?dist}
# cairo/ and svgcairo/ are FreeBSD
# compat/ is BSD
# tools/c2hs (used to build) is GPL, LGPL
@@ -18,27 +18,22 @@
# rest is all LGPL
License: LGPLv2+
Group: Development/Libraries
-Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
URL: http://gtk2hs.sourceforge.net/
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239752
ExcludeArch: ppc64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: alex
-BuildRequires: GConf2-devel
-BuildRequires: ghc = %{ghc_version}
-BuildRequires: gtk2-devel
-BuildRequires: gtksourceview-devel
-BuildRequires: gtkglext-devel
-BuildRequires: haddock
-BuildRequires: happy
-BuildRequires: libglade2-devel
-BuildRequires: gnome-vfs2-devel
+BuildRequires: ghc = %{ghc_version}
+BuildRequires: haddock
+BuildRequires: gtk2-devel
+BuildRequires: gtksourceview-devel
+BuildRequires: libglade2-devel
+BuildRequires: GConf2-devel
%if %{build_mozembed}
-BuildRequires: firefox-devel
+BuildRequires: firefox-devel
%endif
%if %{build_cairo}
-BuildRequires: cairo-devel
-BuildRequires: librsvg2-devel
+BuildRequires: cairo-devel
%endif
%description
@@ -62,22 +57,15 @@
%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: gtksourceview-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
-%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
@@ -124,15 +112,14 @@
%prep
%setup -q %{?snapdate:-n %{name}-%{version}}
+
%build
-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 \
@@ -140,12 +127,8 @@
--enable-firefox \
%endif
%if %{build_cairo}
- --enable-cairo \
- --enable-svg \
+ --enable-cairo
%endif
- --enable-opengl \
- --enable-gnomevfs \
- --enable-docs
# C locale to workaround c2hs failing in CJK locale
LANG=C make all
@@ -184,16 +167,12 @@
for i in glib \
%if %{build_cairo}
cairo \
- svgcairo \
%endif
+ gtk \
gconf \
glade \
- glib \
- gnomevfs \
- gtk \
- gtkglext \
- soegtk \
sourceview \
+ soegtk \
; do
%{ghcpkg_inst $i}
done
@@ -208,18 +187,15 @@
%preun -n %{ghcver}-%{name}
if [ "$1" = 0 ]; then
for i in \
+ soegtk \
gconf \
glade \
- glib \
- gnomevfs \
- gtk \
- gtkglext \
- soegtk \
sourceview \
+ gtk \
%if %{build_cairo}
cairo \
- svgcairo \
%endif
+ glib \
; do
%{ghcpkg_uninst $i}
done
@@ -244,61 +220,39 @@
%dir %{_libdir}/ghc
%dir %{ghclibdir}
%dir %{gtk2hsdir}
-%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
-
+%ghost %{gtk2hsdir}/HSgtk.o
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/gtk
%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
-
-%ghost %{gtk2hsdir}/HSgconf.o
%{gtk2hsdir}/gconf.package.conf
-%{gtk2hsdir}/imports/gconf
%{gtk2hsdir}/libHSgconf.a
-
-%ghost %{gtk2hsdir}/HSglade.o
+%ghost %{gtk2hsdir}/HSgconf.o
+%{gtk2hsdir}/imports/gconf
%{gtk2hsdir}/glade.package.conf
-%{gtk2hsdir}/imports/glade
%{gtk2hsdir}/libHSglade.a
-
-%ghost %{gtk2hsdir}/HSglib.o
+%ghost %{gtk2hsdir}/HSglade.o
+%{gtk2hsdir}/imports/glade
%{gtk2hsdir}/glib.package.conf
-%{gtk2hsdir}/imports/glib
%{gtk2hsdir}/libHSglib.a
-
-%ghost %{gtk2hsdir}/HSsoegtk.o
+%ghost %{gtk2hsdir}/HSglib.o
+%{gtk2hsdir}/imports/glib
+%dir %{gtk2hsdir}/include
+%{gtk2hsdir}/include/gtk2hs-config.h
%{gtk2hsdir}/soegtk.package.conf
-%{gtk2hsdir}/imports/soegtk
%{gtk2hsdir}/libHSsoegtk.a
-
-%ghost %{gtk2hsdir}/HSsourceview.o
+%ghost %{gtk2hsdir}/HSsoegtk.o
+%{gtk2hsdir}/imports/soegtk
%{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
+%ghost %{gtk2hsdir}/HSsourceview.o
+%{gtk2hsdir}/imports/sourceview
%files doc
@@ -317,34 +271,12 @@
%changelog
-* Wed Nov 07 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.1-3
-- Add build dependency on gnome-vfs2-devel
-
-* Tue Nov 06 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.1-2
-- Add build dependency on gtkglext-devel
-
-* Mon Nov 05 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.1-1
-- Update to final prerelease snapshot, require ghc 6.8.1
-
-* Mon Oct 08 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.20070810-5
-- 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
-- bump release number
-
-* Mon Oct 08 2007 Bryan O'Sullivan <bos at serpentine.com> 0.9.12.20070810-1
-- update to ghc-6.8-compatible snapshot
+* Wed Nov 07 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9.12.1-4
+* Revert to 0.9.12 spec file
* Thu Aug 16 2007 Jens Petersen <petersen at redhat.com>
- update License field
-* Thu Aug 16 2007 Jens Petersen <petersen at redhat.com> - 0.9.12-2
-- add patch from upstream to fix change of GType to CUInt (Duncan Coutts)
-
* Fri Jul 27 2007 Bryan O'Sullivan <bos at serpentine.com> - 0.9.12-1
- update to 0.9.12 release
More information about the fedora-extras-commits
mailing list