[leksah-server] Fix #722689.

Lakshmi Narasimhan T V narasim at fedoraproject.org
Sat Aug 13 15:04:31 UTC 2011


commit d9e5f8f50cfddd156518c9594b106a05eacc3914
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Sat Aug 13 20:34:01 2011 +0530

    Fix #722689.

 leksah-server.spec |   76 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 65 insertions(+), 11 deletions(-)
---
diff --git a/leksah-server.spec b/leksah-server.spec
index 2acce72..6cbc7ef 100644
--- a/leksah-server.spec
+++ b/leksah-server.spec
@@ -4,11 +4,12 @@
 
 %global pkg_name leksah-server
 
+# common part of summary for all the subpackages
 %global common_summary Leksah is an IDE for Haskell
 
+# main description used for all the subpackages
 %global common_description This package provides the interface to GHC-API for leksah.
 
-
 Name:           %{pkg_name}
 Version:        0.10.0.4
 Release:        5%{?dist}
@@ -16,21 +17,59 @@ Summary:        %{common_summary}
 
 Group:          Development/Tools
 License:        GPL+
+# BEGIN: cabal2spec-0.24
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-# fedora ghc archs:
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-# macros for building haskell packages
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
+# END: cabal2spec-0.24
+# BR any C devel dependency here
+# list ghc-*-prof dependencies:
 BuildRequires:  ghc-Cabal-prof, ghc-base-prof, ghc-binary-prof, ghc-binary-shared-prof, ghc-bytestring-prof, ghc-containers-prof, ghc-directory-prof, ghc-filepath-prof, ghc-ghc-prof, ghc-ltk-prof, ghc-mtl-prof, ghc-parsec-prof,ghc-pretty-prof, ghc-process-leksah-prof, ghc-time-prof, ghc-deepseq-prof, ghc-hslogger-prof, ghc-network-prof, ghc-haddock-prof, ghc-unix-prof
-Requires:       wget, ghc, haddock >= 2.7.2, cabal-install, ghc-leksah-server
+Requires:       wget, ghc, cabal-install, ghc-leksah-server
 
 %description
 %{common_description}
 
 
+%if %{undefined ghc_without_shared}
+%package -n ghc-%{pkg_name}
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN: cabal2spec-0.24
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END: cabal2spec-0.24
+# remember to require any C devel dependency here
+# Haskell devel dependencies are autogenerated by ghc-deps.sh
+
+%description -n ghc-%{pkg_name}
+%{common_description}
+
+This package contains the shared library.
+%endif
+
+
+%package -n ghc-%{pkg_name}-devel
+Summary:        Development files for %{common_summary}
+Group:          Development/Libraries
+# BEGIN: cabal2spec-0.24
+%{?ghc_devel_requires}
+Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
+Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
+# END: cabal2spec-0.24
+# remember to require any C devel dependency here
+# 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
 
@@ -42,9 +81,13 @@ Requires:       wget, ghc, haddock >= 2.7.2, cabal-install, ghc-leksah-server
 %install
 %ghc_lib_install
 
-# define the shared, devel and prof subpkgs, devel scripts,
-# and filelists: ghc-leksah-server.files, ghc- at PACKAGE@-devel.files
-%ghc_binlib_package
+
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
 
 
 %files
@@ -54,12 +97,23 @@ Requires:       wget, ghc, haddock >= 2.7.2, cabal-install, ghc-leksah-server
 %attr(755,root,root) %{_bindir}/leksahecho
 %attr(644,root,root) %{_datadir}/%{pkg_name}-%{version}/data/prefscoll.lkshp
 
+
+%if %{undefined ghc_without_shared}
+%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
+%defattr(-,root,root,-)
+%endif
+
+
+%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%defattr(-,root,root,-)
+
+
 %changelog
-* Sun Jun 26 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-5
-- Fix requires list
+* Sat Aug 13 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-5
+- Fix requires list. Removed haddock. ghc7 ships with new haddock.
 
-* Wed Jun 22 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-4
-- Rebuild for ghc-process-leksah update.
+* Sun Jun 26 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-4
+- Fix requires list to include ghc-leksah-server
 
 * Tue Jun 21 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-3
 - Upgrade to cabal2spec-0.23.2


More information about the scm-commits mailing list