[ghc-HUnit/el6/master] update to f14 package

[Jens Petersen]

commit 6d7c6df204fc7e114db559ef7c1ae5a82d2f397c
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 7 13:24:26 2010 +1000

    update to f14 package

 .gitignore     |    2 +-
 ghc-HUnit.spec |  163 +++++++++++++++++++++-----------------------------------
 sources        |    2 +-
 3 files changed, 63 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60221ff..47e5d39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-HUnit-1.2.0.3.tar.gz
+HUnit-1.2.2.1.tar.gz
diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec
index 21e07b9..fc0d1f5 100644
--- a/ghc-HUnit.spec
+++ b/ghc-HUnit.spec
@@ -1,74 +1,39 @@
 %global pkg_name HUnit
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# ghc does not emit debug information
+%global common_description HUnit is a unit testing framework for Haskell, inspired by the JUnit tool\
+for Java.
+
+%bcond_without shared
+%bcond_without hscolour
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2 and ghc-6.10.x extralibs!
-Version:        1.2.0.3
-Release:        1%{?dist}
-Summary:        Haskell %{pkg_name} library
+# part of haskell-platform-2010.2.0.0
+Version:        1.2.2.1
+Release:        4%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hunit.sourceforge.net/
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  ghc-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
 %endif
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.  HUnit
-is a unit testing framework for Haskell, inspired by the JUnit tool
-for Java.
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for the %{name}
-library.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
@@ -77,66 +42,60 @@ built for ghc-%{ghc_version}.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
-%install
-rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%check
+%cabal test
 
 
-%clean
+%install
 rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
+# remove unwanted files
+rm $RPM_BUILD_ROOT%{_bindir}/*-tests
+rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
 
-%post devel
-%ghc_register_pkg
+echo %doc LICENSE >> %{name}.files
+echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files
 
 
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+%ghc_lib_package -o 1.2.2.1-4
 
 
 %changelog
+* Sat Jul 31 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-4
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- part of haskell-platform-2010.2.0.0
+- add hscolour
+- datadir filelist cleanup
+
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-3
+- sync cabal2spec-0.22.1
+
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-2
+- part of haskell-platform-2010.1.0.0
+- rebuild against ghc-6.12.2
+- condition ghc_lib_package
+
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-1
+- update 1.2.2.1 (current haskell-platform-2009.3.1)
+- remove test programs and move doc files to docdir
+- add check section for test programs
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common summary and common_description
+- use ghc_lib_package
+- drop redundant buildroot and its install cleaning
+
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.2.0.3-2
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 1.2.0.3-1
 - initial packaging for Fedora created by cabal2spec
diff --git a/sources b/sources
index 5d6b959..950cd56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-948b5b20ff22fa81c6390b08d6af5104  HUnit-1.2.0.3.tar.gz
+2634e94c27486f8e8feeb778f78c663f  HUnit-1.2.2.1.tar.gz