rpms/ghc-gtk2hs/devel ghc-gtk2hs.spec,1.14,1.15
Jens Petersen
petersen at fedoraproject.org
Mon Mar 9 06:41:42 UTC 2009
Author: petersen
Update of /cvs/pkgs/rpms/ghc-gtk2hs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1918
Modified Files:
ghc-gtk2hs.spec
Log Message:
- use global and update arch list
- rename library subpackages to devel and obsolete old packages
Index: ghc-gtk2hs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-gtk2hs/devel/ghc-gtk2hs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ghc-gtk2hs.spec 24 Feb 2009 21:15:59 -0000 1.14
+++ ghc-gtk2hs.spec 9 Mar 2009 06:41:12 -0000 1.15
@@ -1,29 +1,34 @@
-#%%define snapdate 20090125
+#%%global snapdate 20090125
-%define pkg_name gtk2hs
-%define ghc_version 6.10.1
+%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
+
%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}
+# ghc does not emit debug information
+%global debug_package %{nil}
-%define common_descr \
+%global 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.10.0
-Release: 2%{?snapdate:.%{snapdate}}%{?dist}
+Release: 3%{?snapdate:.%{snapdate}}%{?dist}
# cairo/ and svgcairo/ are FreeBSD
# compat/ is BSD
# tools/c2hs (used to build) is GPLv2+, LGPLv2+
@@ -41,9 +46,9 @@
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 i686 x86_64 ppc
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# fedora ghc archs:
+ExclusiveArch: %{ix86} x86_64 ppc alpha
BuildRequires: ghc = %{ghc_version}
BuildRequires: happy, alex
%if %{with docs}
@@ -90,9 +95,10 @@
# 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}
+# these 3 pull in the others
+Requires: ghc-gconf-devel = %{version}-%{release}
+Requires: ghc-glade-devel = %{version}-%{release}
+Requires: ghc-soegtk-devel = %{version}-%{release}
%description compat
%common_descr
@@ -124,8 +130,8 @@
# subpackage name lib [dep] [obsoletes]
-%define subpackage()\
-%package -n ghc-%1\
+%global subpackage()\
+%package -n ghc-%1-devel\
Summary: Haskell binding for %1\
Group: Development/Libraries\
Requires: ghc = %{ghc_version}\
@@ -133,22 +139,24 @@
Requires: %2-devel, %{?3:ghc-%3 = %{version}-%{release}}\
Requires(post): %{_bindir}/ghc-pkg-%{ghc_version}\
Requires(preun): %{_bindir}/ghc-pkg-%{ghc_version}\
+# added for F11
+Obsoletes: ghc-%1 < 0.10.0-3
%{?4:Obsoletes: %4 < 0.10.0}\
\
-%description -n ghc-%1\
+%description -n ghc-%1-devel\
%common_descr\
\
This package contains a Haskell binding of the %1 library.\
\
-%post -n ghc-%1\
+%post -n ghc-%1-devel\
ghc-pkg-%{ghc_version} update %{pkg_libdir}/%1.package.conf &>/dev/null || : \
\
-%preun -n ghc-%1\
+%preun -n ghc-%1-devel\
if [ "$1" = 0 ]; then\
ghc-pkg-%{ghc_version} unregister %1-%{version} &>/dev/null || : \
fi\
\
-%files -n ghc-%1\
+%files -n ghc-%1-devel\
%{pkg_libdir}/%1.cabal\
%{pkg_libdir}/%1.package.conf\
%{pkg_libdir}/libHS%1.a\
@@ -180,10 +188,6 @@
%subpackage soegtk gtk2 gtk
%subpackage svgcairo librsvg2 cairo
-# the debuginfo subpackage is currently empty anyway, so don't generate it
-%define debug_package %{nil}
-
-
%prep
%if %{?snapdate:1}0
%setup -q -n %{pkg_name}-%{version}-%{snapdate}
@@ -270,6 +274,11 @@
%changelog
+* Mon Mar 9 2009 Jens Petersen <petersen at redhat.com> - 0.10.0-3
+- use global
+- update arch list
+- rename library subpackages to devel and obsolete old packages
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list