[ghc-chalmers-lava2000] update to cabal2spec-0.25

Jens Petersen petersen at fedoraproject.org
Sat Mar 24 07:52:05 UTC 2012


commit d140547f518d087e289c5df90509746648ec00c6
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Mar 24 16:52:00 2012 +0900

    update to cabal2spec-0.25

 ghc-chalmers-lava2000.spec |   66 ++++++++++++--------------------------------
 1 files changed, 18 insertions(+), 48 deletions(-)
---
diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec
index 8b2f8a4..bfa8709 100644
--- a/ghc-chalmers-lava2000.spec
+++ b/ghc-chalmers-lava2000.spec
@@ -1,18 +1,16 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name chalmers-lava2000
 
-# common part of summary for all the subpackages
-%global common_summary Haskell %{pkg_name} library
+%global common_summary Haskell hardware description library
 
-# main description used for all the subpackages
-%global common_description A %{pkg_name} library for Haskell.
+%global common_description A Hardware description library for Haskell.
 
 Name:           ghc-%{pkg_name}
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -20,42 +18,18 @@ License:        BSD
 # BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:        README.fedora
-Patch0:         ghc-chalmers-lava2000-remove-verification-modules.patch       
-
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
-# BR any C devel dependency here
-# list ghc-*-prof dependencies:
-BuildRequires:  ghc 
-
+Source1:        README.fedora
+BuildRequires:  ghc-haskell98-prof
+Patch0:         ghc-chalmers-lava2000-remove-verification-modules.patch
 
 %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
-# 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 -n %{pkg_name}-%{version}
 %patch0 -p1 -b .orig
@@ -63,14 +37,12 @@ This package contains the development files.
 
 
 %build
-# define cabal_configure_options -f "opt1 -opt2 ..."
 %ghc_lib_build
 
 
 %install
 %ghc_lib_install
 
-
 # cleanup extra data files
 echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
 %{__mv} %{buildroot}%{_datadir}/%{pkg_name}-%{version}/Doc/tutorial.ps .
@@ -78,24 +50,22 @@ echo "%{_datadir}/%{pkg_name}-%{version}" >> %{name}-devel.files
 echo "%doc tutorial.ps.gz" >> %{name}-doc.files
 %{__rm} -r %{buildroot}%{_datadir}/%{pkg_name}-%{version}/{Doc,INSTALL}
 
+# devel subpackage
+%ghc_devel_package
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_post_postun
 
 
-%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 LICENSE
 
 
 %changelog
+* Sat Mar 24 2012 Jens Petersen <petersen at redhat.com> - 1.1.2-3
+- update to cabal2spec-0.25
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list