[ghc-editline] update to cabal2spec-0.24.1 and use _isa for libedit

Jens Petersen petersen at fedoraproject.org
Wed Oct 26 01:08:22 UTC 2011


commit e02c5fcdce90a31159ab4a65ed5569bb4bec62a6
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Oct 26 10:08:20 2011 +0900

    update to cabal2spec-0.24.1 and use _isa for libedit

 ghc-editline.spec |   55 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 10 deletions(-)
---
diff --git a/ghc-editline.spec b/ghc-editline.spec
index 85c02bb..c66c404 100644
--- a/ghc-editline.spec
+++ b/ghc-editline.spec
@@ -9,29 +9,47 @@ to the editline API for reading lines in input for the user.\
 Additionally, a readline compatibility module is included, which\
 provides a subset of the functionality of the readline library.
 
-%global ghc_pkg_c_deps libedit-devel
-
 Name:           ghc-%{pkg_name}
 Version:        0.2.1.0
-Release:        24%{?dist}
-
+Release:        25%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.haskell.org/editline
+# BEGIN cabal2spec
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.3
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+%endif
+# END cabal2spec
+BuildRequires:  libedit-devel%{?_isa}
+BuildRequires:  ghc-base-prof
 
 %description
 %{common_description}
 
 
+%package -n ghc-%{pkg_name}-devel
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN cabal2spec
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END cabal2spec
+Requires:       libedit-devel%{?_isa}
+# Haskell devel dependencies are autogenerated by ghc-deps.sh
+
+%description -n ghc-%{pkg_name}-devel
+%{common_description}
+
+This package contains the development files.
+
+
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -44,10 +62,27 @@ BuildRequires:  hscolour
 %ghc_lib_install
 
 
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%endif
+
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
 
 
 %Changelog
+* Wed Oct 26 2011 Jens Petersen <petersen at redhat.com> - 0.2.1.0-25
+- update to cabal2spec-0.24.1
+- use _isa for libedit dependency
+
 * Sun Jun 19 2011 Jochen Schmitt <Jochen herr-schmitt de> 0.2.1.0-24
 - Rebuild for new ghc release
 


More information about the scm-commits mailing list