diff --git a/.gitignore b/.gitignore index 86c74a1..0c8df2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /unordered-containers-0.1.4.3.tar.gz +/unordered-containers-0.1.4.6.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index a9e6485..92087cf 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,20 +1,18 @@ -# 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 unordered-containers -# common part of summary for all the subpackages %global common_summary Efficient hashing-based container types -# main description used for all the subpackages %global common_description Efficient hashing-based container types. The containers have been optimized\ for performance critical use, both in terms of large data quantities and\ high speed. The declared cost of each operation is either worst-case or\ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} -Version: 0.1.4.3 +Version: 0.1.4.6 Release: 1%{?dist} Summary: %{common_summary} @@ -25,10 +23,7 @@ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz 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 BuildRequires: ghc-deepseq-prof BuildRequires: ghc-hashable-prof @@ -37,21 +32,6 @@ BuildRequires: ghc-hashable-prof %{common_description} -%package -n ghc-%{pkg_name}-devel -Summary: Development files for %{common_summary} -Group: Development/Libraries -# BEGIN cabal2spec -%{?ghc_devel_requires} -Provides: ghc-%{pkg_name}-prof = %{version}-%{release} -# END cabal2spec -# 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} @@ -64,23 +44,21 @@ This package contains the development files. %ghc_lib_install -%post -n ghc-%{pkg_name}-devel -%ghc_pkg_recache +%ghc_devel_package +%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 %changelog +* Thu Jan 5 2012 Jens Petersen - 0.1.4.6-1 +- update to 0.1.4.6 and cabal2spec-0.25.2 + * Wed Nov 23 2011 Jens Petersen - 0.1.4.3-1 - BSD license - depends on deepseq and hashable diff --git a/sources b/sources index 33cf323..cf67fc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ec97a55ecdc117a592b8868d6d9a971 unordered-containers-0.1.4.3.tar.gz +6909de725813a2086bf2f3b69bc43459 unordered-containers-0.1.4.6.tar.gz