rpms/gtk2hs/devel gtk2hs.spec,1.1,1.2
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Wed Aug 2 01:38:07 UTC 2006
Author: petersen
Update of /cvs/extras/rpms/gtk2hs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12520
Modified Files:
gtk2hs.spec
Log Message:
- mozilla-devel is now firefox-devel
- replace tabs in .spec by spaces
Index: gtk2hs.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2hs/devel/gtk2hs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk2hs.spec 15 May 2006 03:18:55 -0000 1.1
+++ gtk2hs.spec 2 Aug 2006 01:38:07 -0000 1.2
@@ -1,30 +1,30 @@
%define ghc_version 6.4.2
%define ghcver ghc642
-%define mozver 37:1.7.13
+%define mozver 1.5.0.5
%define build_mozembed 1
%define build_cairo 1
-Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
-Name: gtk2hs
-Version: 0.9.10
-Release: 1%{?dist}
-License: LGPL
-Group: Development/Libraries
-Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-URL: http://gtk2hs.sourceforge.net/
-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
+Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
+Name: gtk2hs
+Version: 0.9.10
+Release: 2%{?dist}
+License: LGPL
+Group: Development/Libraries
+Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL: http://gtk2hs.sourceforge.net/
+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
%if %{build_mozembed}
-BuildRequires: mozilla-devel = %{mozver}
+BuildRequires: firefox-devel = %{mozver}
%endif
%if %{build_cairo}
-BuildRequires: cairo-devel
+BuildRequires: cairo-devel
%endif
%description
@@ -34,10 +34,10 @@
%package -n ghc-%{name}
-Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
-Group: Development/Libraries
-Requires: ghc = %{ghc_version}
-Requires: %{ghcver}-%{name} = %{version}-%{release}
+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
@@ -46,14 +46,14 @@
%package -n %{ghcver}-%{name}
-Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
-Group: Development/Libraries
-Requires: %{ghcver}
-Requires: gtk2-devel
-Requires: GConf2-devel
-Requires: libglade2-devel
-Requires: gtksourceview-devel
-PreReq: %{_bindir}/ghc-pkg-%{ghc_version}
+Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
+Group: Development/Libraries
+Requires: %{ghcver}
+Requires: gtk2-devel
+Requires: GConf2-devel
+Requires: libglade2-devel
+Requires: gtksourceview-devel
+PreReq: %{_bindir}/ghc-pkg-%{ghc_version}
%description -n %{ghcver}-%{name}
A Gtk+ binding for the functional language Haskell featuring automatic memory
@@ -65,8 +65,8 @@
%package doc
-Summary: Haskell Gtk+ GUI library documentation
-Group: Development/Libraries
+Summary: Haskell Gtk+ GUI library documentation
+Group: Development/Libraries
%description doc
A Gtk+ binding for the functional language Haskell featuring automatic
@@ -78,12 +78,12 @@
%if %{build_mozembed}
%package -n %{ghcver}-%{name}-mozembed
-Summary: Haskell binding for gtkembedmoz
-Group: Development/Libraries
-Requires: %{ghcver}
-Requires: %{ghcver}-%{name} = %{version}-%{release}
-Requires: mozilla-devel = %{mozver}
-PreReq: %{_bindir}/ghc-pkg-%{ghc_version}
+Summary: Haskell binding for gtkembedmoz
+Group: Development/Libraries
+Requires: %{ghcver}
+Requires: %{ghcver}-%{name} = %{version}-%{release}
+Requires: firefox-devel = %{mozver}
+PreReq: %{_bindir}/ghc-pkg-%{ghc_version}
%description -n %{ghcver}-%{name}-mozembed
A Haskell binding of GtkEmbedMoz for gtk2hs.
@@ -104,21 +104,22 @@
%build
%configure \
- --with-hc=ghc-%{ghc_version} \
- --prefix=%{_prefix} \
- --libdir=%{ghclibdir} \
- --enable-packager-mode \
- --enable-docs \
- --enable-libglade \
- --enable-gconf \
- --enable-sourceview \
+ --with-hc=ghc-%{ghc_version} \
+ --prefix=%{_prefix} \
+ --libdir=%{ghclibdir} \
+ --enable-packager-mode \
+ --enable-docs \
+ --enable-libglade \
+ --enable-gconf \
+ --enable-sourceview \
%if %{build_mozembed}
- --enable-mozilla \
+ --enable-mozilla \
%endif
%if %{build_cairo}
- --enable-cairo
+ --enable-cairo
%endif
+# C locale to workaround c2hs failing in CJK locale
LANG=C make all
@@ -129,12 +130,12 @@
# make ghost files
for i in gconf glade glib gtk mogul sourceview \
%if %{build_cairo}
- cairo \
+ cairo \
%endif
%if %{build_mozembed}
- mozembed \
+ mozembed \
%endif
- ; do
+ ; do
touch %{buildroot}%{gtk2hsdir}/HS${i}.o
done
@@ -154,13 +155,13 @@
%post -n %{ghcver}-%{name}
for i in glib \
%if %{build_cairo}
- cairo \
+ cairo \
%endif
- gtk \
- mogul \
- gconf \
- glade \
- sourceview \
+ gtk \
+ mogul \
+ gconf \
+ glade \
+ sourceview \
; do
%{ghcpkg_inst $i}
done
@@ -175,15 +176,15 @@
%preun -n %{ghcver}-%{name}
if [ "$1" = 0 ]; then
for i in \
- gconf \
- glade \
- sourceview \
- mogul \
- gtk \
+ gconf \
+ glade \
+ sourceview \
+ mogul \
+ gtk \
%if %{build_cairo}
- cairo \
+ cairo \
%endif
- glib \
+ glib \
; do
%{ghcpkg_uninst $i}
done
@@ -266,6 +267,9 @@
%changelog
+* Wed Aug 2 2006 Jens Petersen <petersen at redhat.com> - 0.9.10-2
+- mozilla-devel is now firefox-devel
+
* Mon May 15 2006 Jens Petersen <petersen at redhat.com> - 0.9.10-1
- rework packaging to keep all the ghc packages together except mozembed
- update mozilla version to 1.7.13
More information about the scm-commits
mailing list