diff --git a/.gitignore b/.gitignore index 3c5bbc5..7c5169b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /digest-0.0.0.9.tar.gz /digest-0.0.1.0.tar.gz /digest-0.0.1.1.tar.gz +/digest-0.0.1.2.tar.gz diff --git a/digest-0.0.1.1-bytestring-in-base.patch b/digest-0.0.1.1-bytestring-in-base.patch deleted file mode 100644 index 4acd8e4..0000000 --- a/digest-0.0.1.1-bytestring-in-base.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- digest-0.0.1.1/digest.cabal~ 2012-03-09 16:43:29.000000000 +0900 -+++ digest-0.0.1.1/digest.cabal 2012-11-17 22:43:34.027421368 +0900 -@@ -22,6 +22,7 @@ - flag bytestring-in-base - description: In the ghc-6.6 era the bytestring modules were - included in the base package. -+ default: False - - source-repository head - type: git diff --git a/ghc-digest.spec b/ghc-digest.spec index 7a8f20e..7b17145 100644 --- a/ghc-digest.spec +++ b/ghc-digest.spec @@ -1,38 +1,45 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name digest -%global common_summary Cryptographic hashes for bytestrings - -%global common_description This package provides efficient cryptographic hash implementations for strict\ -and lazy bytestrings. For now, CRC32 and Adler32 are supported; they are\ -implemented as FFI bindings to efficient code from zlib. - Name: ghc-%{pkg_name} -Version: 0.0.1.1 -Release: 5%{?dist} -Summary: %{common_summary} +Version: 0.0.1.2 +Release: 1%{?dist} +Summary: Cryptographic hashes for bytestrings License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -Patch0: digest-0.0.1.1-bytestring-in-base.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel -# End cabal-rpm deps BuildRequires: zlib-devel%{?_isa} +# End cabal-rpm deps %description -%{common_description} +This package provides efficient cryptographic hash implementations for +strict and lazy bytestrings. For now, CRC32 and Adler32 are supported; +they are implemented as FFI bindings to efficient code from zlib. + + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: %{name} = %{version}-%{release} +# Begin cabal-rpm deps: +Requires: zlib-devel%{?_isa} +# End cabal-rpm deps + +%description devel +This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -%patch0 -p1 -b .orig %build @@ -43,19 +50,26 @@ BuildRequires: zlib-devel%{?_isa} %ghc_lib_install -%ghc_devel_package -Requires: zlib-devel%{?_isa} - -%ghc_devel_description +%post devel +%ghc_pkg_recache -%ghc_devel_post_postun +%postun devel +%ghc_pkg_recache -%ghc_files LICENSE +%files -f %{name}.files +%doc LICENSE + + +%files devel -f %{name}-devel.files %changelog +* Fri Jun 07 2013 Jens Petersen - 0.0.1.2-1 +- update to 0.0.1.2 +- update to new simplified Haskell Packaging Guidelines + * Wed Feb 13 2013 Fedora Release Engineering - 0.0.1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 60877bd..701df39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddc7586f4d5a44ffa03fe6ac7ae39f90 digest-0.0.1.1.tar.gz +83ed3d8c10d24c88d5ddf4f3914507ac digest-0.0.1.2.tar.gz