[leksah-server/f16] Fix bug 755394. Update to cabal2spec 0.25.2
narasim
narasim at fedoraproject.org
Sun Jan 22 06:33:06 UTC 2012
commit 5de30c23e032d89a98e8c9aedfb258edb6b77ea3
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date: Sun Jan 22 12:02:40 2012 +0530
Fix bug 755394. Update to cabal2spec 0.25.2
modified: leksah-server.spec
leksah-server.spec | 85 ++++++++++++++--------------------------------------
1 files changed, 23 insertions(+), 62 deletions(-)
---
diff --git a/leksah-server.spec b/leksah-server.spec
index fbf9416..ca5f6b2 100644
--- a/leksah-server.spec
+++ b/leksah-server.spec
@@ -1,75 +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: 6%{?dist}
+Release: 7%{?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
-BuildRequires: hscolour
-# 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, ghc-leksah-server
+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
@@ -82,33 +43,33 @@ 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
-%defattr(-,root,root,-)
%doc LICENSE
%attr(755,root,root) %{_bindir}/%{name}
%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,-)
+%ghc_files
%changelog
+* Sun Jan 22 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-7
+- Update to cabal2spec-0.25.2. Remove dependency on ghc7
+
* Sat Aug 13 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-6
- Fix requires list. Removed haddock. ghc7 ships with new haddock.
More information about the scm-commits
mailing list