rpms/ghc-gtk2hs/F-11 .cvsignore, 1.4, 1.5 ghc-gtk2hs.spec, 1.18, 1.19 sources, 1.4, 1.5
Jens Petersen
petersen at fedoraproject.org
Sat May 30 00:04:33 UTC 2009
Author: petersen
Update of /cvs/pkgs/rpms/ghc-gtk2hs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32501
Modified Files:
.cvsignore ghc-gtk2hs.spec sources
Log Message:
backport from devel for ghc-6.10.3 rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 7 Feb 2009 13:33:54 -0000 1.4
+++ .cvsignore 30 May 2009 00:04:02 -0000 1.5
@@ -1 +1 @@
-gtk2hs-0.10.0.tar.gz
+gtk2hs-0.10.1.tar.bz2
Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-11/ghc-gtk2hs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ghc-gtk2hs.spec 14 Apr 2009 10:01:05 -0000 1.18
+++ ghc-gtk2hs.spec 30 May 2009 00:04:02 -0000 1.19
@@ -1,10 +1,4 @@
-#%%global snapdate 20090125
-
%global pkg_name gtk2hs
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}
%bcond_without docs
%bcond_without prof
@@ -15,9 +9,12 @@
%bcond_without opengl
%bcond_without gstreamer
-%bcond_with gnomevfs
+# currently segfaulting
%bcond_with mozembed
+# external haddock
+%bcond_with haddock
+
# ghc does not emit debug information
%global debug_package %{nil}
@@ -26,9 +23,9 @@ A Gtk+ binding for the functional langua
management, unicode support, and wide coverage of Gtk+ 2 widgets.
Summary: Haskell binding for gtk2 and related libraries
-Name: ghc-gtk2hs
-Version: 0.10.0
-Release: 4%{?snapdate:.%{snapdate}}%{?dist}
+Name: ghc-%{pkg_name}
+Version: 0.10.1
+Release: 4%{?dist}
# cairo/ and svgcairo/ are FreeBSD
# compat/ is BSD
# tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -37,26 +34,24 @@ Release: 4%{?snapdate:.%{snapdate
# 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}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
-%else
-Source: http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.gz
-%endif
+# cd gtk2hs ; darcs dist darcs dist --dist-name=gtk2hs-%{version}.%{snapdate}
+Source: http://prdownloads.sourceforge.net/%{pkg_name}/%{pkg_name}-%{version}.tar.bz2
URL: http://gtk2hs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc = %{ghc_version}
+BuildRequires: ghc, ghc-rpm-macros
BuildRequires: happy, alex
%if %{with docs}
+%if %{with haddock}
BuildRequires: haddock >= 2.4.1
-BuildRequires: ghc-doc = %{ghc_version}
+%endif
+BuildRequires: ghc-doc
%endif
%if %{with prof}
-BuildRequires: ghc-prof = %{ghc_version}
+BuildRequires: ghc-prof
%endif
BuildRequires: gtk2-devel
BuildRequires: gtksourceview2-devel
@@ -66,7 +61,7 @@ BuildRequires: GConf2-devel, dbus-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel
%endif
%if %{with mozembed}
-BuildRequires: xulrunner-devel
+BuildRequires: xulrunner-devel-unstable
%endif
%if %{with cairo}
BuildRequires: cairo-devel
@@ -137,8 +132,9 @@ Group: Development/Libraries\
Requires: ghc = %{ghc_version}\
Requires: %{name}-common = %{version}-%{release}\
Requires: %2-devel, %{?3:ghc-%3-devel = %{version}-%{release}}\
-Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\
-Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\
+Requires(post): ghc = %{ghc_version}\
+Requires(preun): ghc = %{ghc_version}\
+Provides: ghc-%1 = %{version}-%{release}\
# added for F11\
Obsoletes: ghc-%1 < 0.10.0-3\
%{?4:Obsoletes: %4 < 0.10.0}\
@@ -162,7 +158,7 @@ This package contains the profiling libr
%endif\
\
%post -n ghc-%1-devel\
-ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \
+ghc-pkg-%{ghc_version} update %{ghcpkgdir}/%1.package.conf &>/dev/null || : \
\
%preun -n ghc-%1-devel\
if [ "$1" = 0 ]; then\
@@ -171,16 +167,16 @@ fi\
\
%files -n ghc-%1-devel\
%defattr(-,root,root,-)\
-%{pkg_libdir}/%1.cabal\
-%{pkg_libdir}/%1.package.conf\
-%{pkg_libdir}/libHS%1.a\
-%{pkg_libdir}/HS%1.o\
-%{pkg_libdir}/imports/%1\
+%{ghcpkgdir}/%1.cabal\
+%{ghcpkgdir}/%1.package.conf\
+%{ghcpkgdir}/libHS%1.a\
+%{ghcpkgdir}/HS%1.o\
+%{ghcpkgdir}/imports/%1\
\
%if %{with prof}\
%files -n ghc-%1-prof\
%defattr(-,root,root,-)\
-%{pkg_libdir}/libHS%{1}_p.a\
+%{ghcpkgdir}/libHS%{1}_p.a\
%endif
%subpackage cairo cairo glib
@@ -190,9 +186,6 @@ fi\
%endif
%subpackage glade libglade2 gtk
%subpackage glib glib2
-%if %{with gnomevfs}
-%subpackage gnomevfs gnomevfs glib
-%endif
%if %{with gstreamer}
%subpackage gstreamer gstreamer glib
%endif
@@ -208,17 +201,15 @@ fi\
%subpackage svgcairo librsvg2 cairo
%prep
-%if %{?snapdate:1}0
-%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
+%if %{with haddock}
+export HADDOCK=%{_bindir}/haddock-2.4.2
+%endif
%endif
%configure \
--with-hc=ghc-%{ghc_version} \
@@ -236,7 +227,7 @@ export HADDOCK=%{_bindir}/haddock-2.4.1
--enable-gstreamer \
--enable-gtksourceview2 \
%if %{with mozembed}
- --enable-xulrunner \
+ --enable-mozilla \
%endif
%if %{with opengl}
--enable-opengl \
@@ -250,12 +241,12 @@ export HADDOCK=%{_bindir}/haddock-2.4.1
%{nil}
# C locale to workaround c2hs failing in CJK locale
-LANG=C make all pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+LANG=C make all pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} pkglibdir=%{pkg_libdir} htmldocdir=%{pkg_docdir}
+make install DESTDIR=%{buildroot} pkglibdir=%{ghcpkgdir} htmldocdir=%{ghcdocdir}
%clean
@@ -278,21 +269,42 @@ rm -rf %{buildroot}
%files common
%defattr(-,root,root,-)
%doc AUTHORS COPYING*
-%dir %{pkg_libdir}
-%dir %{pkg_libdir}/imports
-%dir %{pkg_libdir}/include
-%{pkg_libdir}/include/gtk2hs-config.h
+%dir %{ghcpkgdir}
+%dir %{ghcpkgdir}/imports
+%dir %{ghcpkgdir}/include
+%{ghcpkgdir}/include/gtk2hs-config.h
%if %{with docs}
%files doc
%defattr(-,root,root,-)
%doc ChangeLog TODO demo
-%{pkg_docdir}
+%{ghcdocdir}
%endif
%changelog
+* Sat May 30 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-4
+- disable mozembed again since it is segfaulting
+ http://hackage.haskell.org/trac/gtk2hs/ticket/1168
+- let subpackages provide ghc-pkg_name
+
+* Sun May 24 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-3
+- enable mozembed and drop gnomevfs bcond
+- remove some redundant snapdate usage
+
+* Sat May 16 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-2
+- add bcond haddock
+- buildrequire ghc-rpm-macros
+
+* Mon May 11 2009 Jens Petersen <petersen at redhat.com> - 0.10.1-1
+- update to 0.10.1
+
+* Sat Apr 25 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-5
+- rebuild against ghc-6.10.2
+- use haddock-2.4.2
+- update to new ghcpkgdir and ghcdocdir macros
+
* Tue Apr 14 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-4
- use define not global to define subpackage since it broke ?3: expansion
- require the subpackage dependency with -devel suffix
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 7 Feb 2009 13:33:54 -0000 1.4
+++ sources 30 May 2009 00:04:02 -0000 1.5
@@ -1 +1 @@
-08df47256cbcd5668e82b9f8beb621ab gtk2hs-0.10.0.tar.gz
+b5422d8091af9334585bd4b732a7101d gtk2hs-0.10.1.tar.bz2
More information about the scm-commits
mailing list