[ghc-utf8-string/el6/master] update to package from F14

Tue Oct 5 01:54:36 UTC 2010

commit 11ff39d0cd6b1539099682a6a4e451a540566f37
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Oct 5 11:54:40 2010 +1000

    update to package from F14

 .gitignore           |    2 +-
 ghc-utf8-string.spec |  140 ++++++++++++++------------------------------------
 sources              |    2 +-
 3 files changed, 41 insertions(+), 103 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 514e093..0583a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-utf8-string-0.3.5.tar.gz
+utf8-string-0.3.6.tar.gz
diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec
index 40aeeed..3abb9b1 100644
--- a/ghc-utf8-string.spec
+++ b/ghc-utf8-string.spec
@@ -1,76 +1,38 @@
 %global pkg_name utf8-string
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell UTF8 layer for IO and Strings
 
-# ghc does not emit debug information
+%global common_description The utf8-string package provides operations\
+for encoding UTF8 strings to Word8 lists and back, and for reading and writing\
+UTF8 without truncation. 
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.3.5
-Release:        3%{?dist}
-Summary:        Haskell UTF8 layer for IO and Strings.
+Version:        0.3.6
+Release:        5%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 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, 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
-The utf8-string package provides operations
-for encoding UTF8 strings to Word8 lists and back, and for reading and writing
-UTF8 without truncation. 
-
-%package devel
-Summary:        Haskell UTF8 layer for IO and Strings.
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-The utf8-string package provides operations
-for encoding UTF8 strings to Word8 lists and back, and for reading and writing
-UTF8 without truncation. 
-
-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
 
 
@@ -79,67 +41,43 @@ 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}
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
+%ghc_lib_package -o 0.3.6-5
 
-%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
 
+%changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-5
+- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
 
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-4
+- use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0)
 
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-3
+- ghc-6.12.2 doesn't provide utf8-string again
+- condition ghc_lib_package
 
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 0.3.6-2
+- 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
 
+* Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 0.3.6-1
+- update to 0.3.6
+- update packaging for ghc-6.12.1
+- added shared library support: needs ghc-rpm-macros 0.3.1
 
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
-%changelog
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 9d8ac64..ffc9ed1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5198209bd81ea4f8af7692e2467336c  utf8-string-0.3.5.tar.gz
+be8c5ef52a0824babdc89d60c1e9b600  utf8-string-0.3.6.tar.gz
