[leksah-server] Update to cabal2spec-0.25.2. Fix for bug 755394. Remove dependency on ghc modified: leksah-server

narasim narasim at fedoraproject.org
Sun Jan 22 06:24:51 UTC 2012


commit 9ab798cb389b31d8cffa90a78175020a8863d16c
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Sun Jan 22 11:36:45 2012 +0530

    Update to cabal2spec-0.25.2. Fix for bug 755394. Remove dependency on ghc
    	modified:   leksah-server.spec

 leksah-server.spec |   82 +++++++++++++--------------------------------------
 1 files changed, 21 insertions(+), 61 deletions(-)
---
diff --git a/leksah-server.spec b/leksah-server.spec
index 6948cfa..743d679 100644
--- a/leksah-server.spec
+++ b/leksah-server.spec
@@ -1,79 +1,36 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %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:        10%{?dist}
+Release:        11%{?dist}
 Summary:        %{common_summary}
 
 Group:          Development/Tools
 # License in the LICENSE file is mentioned as GPLV2 while sources specify
 # license as GPL.Hence GPL+.
 License:        GPL+
-# BEGIN: cabal2spec-0.24
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
-# END: cabal2spec-0.24
-# BR any C devel dependency here
-# list ghc-*-prof dependencies:
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 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, cabal-install
+Requires:       wget, cabal-install
 
 %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
 
@@ -86,12 +43,17 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_package
+
+%ghc_description
+
+
+%ghc_devel_package
 
+%ghc_devel_description
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+
+%ghc_devel_post_postun
 
 
 %files
@@ -101,15 +63,13 @@ This package contains the development files.
 %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
-%endif
-
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files
 
 
 %changelog
+* Sun Jan 22 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-11
+- Update to cabal2spec-0.25.2. Remove dependency on ghc
+
 * Sun Jan 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-10
 - Rebuild for haskell-platform update
 


More information about the scm-commits mailing list