From efdfd43fe274de7a463e21a58c9c67b1b1f111d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 15 Dec 2011 12:56:03 +0000 Subject: [PATCH 01/61] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From d6ebb2aba80e48000edc163ff05bfbe0b0ee6d4c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 16 Dec 2011 11:32:09 +0900 Subject: [PATCH 02/61] import from #756386 --- .gitignore | 1 + ghc-unordered-containers.spec | 89 +++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 91 insertions(+) create mode 100644 ghc-unordered-containers.spec diff --git a/.gitignore b/.gitignore index e69de29..86c74a1 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/unordered-containers-0.1.4.3.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec new file mode 100644 index 0000000..a9e6485 --- /dev/null +++ b/ghc-unordered-containers.spec @@ -0,0 +1,89 @@ +# For Haskell Packaging Guidelines see: +# - 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 +Release: 1%{?dist} +Summary: %{common_summary} + +Group: System Environment/Libraries +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 +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros +%if %{undefined without_hscolour} +BuildRequires: hscolour +%endif +# END cabal2spec +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-hashable-prof + +%description +%{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} + + +%build +%ghc_lib_build + + +%install +%ghc_lib_install + + +%post -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{pkg_name}-devel +%ghc_pkg_recache + + +%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 + + +%changelog +* Wed Nov 23 2011 Jens Petersen - 0.1.4.3-1 +- BSD license +- depends on deepseq and hashable + +* Wed Nov 23 2011 Fedora Haskell SIG +- initial packaging for Fedora automatically generated by cabal2spec-0.24.1 diff --git a/sources b/sources index e69de29..33cf323 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1ec97a55ecdc117a592b8868d6d9a971 unordered-containers-0.1.4.3.tar.gz From 755a0f72c2939af1027cf44c092022e7dec5c3e8 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Jan 2012 21:41:14 +0900 Subject: [PATCH 03/61] update to 0.1.4.6 and cabal2spec-0.25.2 --- .gitignore | 1 + ghc-unordered-containers.spec | 46 +++++++++-------------------------- sources | 2 +- 3 files changed, 14 insertions(+), 35 deletions(-) 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 From 2ff331476982f57d64c55f61b1ac954c662a7e62 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Mar 2012 09:55:03 +0900 Subject: [PATCH 04/61] rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 92087cf..5ce9e50 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -13,7 +13,7 @@ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} Version: 0.1.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -56,6 +56,9 @@ BuildRequires: ghc-hashable-prof %changelog +* Thu Mar 8 2012 Jens Petersen - 0.1.4.6-2 +- rebuild + * Thu Jan 5 2012 Jens Petersen - 0.1.4.6-1 - update to 0.1.4.6 and cabal2spec-0.25.2 From 98a265e0ebd27adb170ceb2265f6a48a1b0e15fc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 14:37:36 +0900 Subject: [PATCH 05/61] add license to ghc_files --- ghc-unordered-containers.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 5ce9e50..1ad260e 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -13,7 +13,7 @@ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} Version: 0.1.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -52,10 +52,13 @@ BuildRequires: ghc-hashable-prof %ghc_devel_post_postun -%ghc_files +%ghc_files LICENSE %changelog +* Fri Mar 23 2012 Jens Petersen - 0.1.4.6-3 +- add license to ghc_files + * Thu Mar 8 2012 Jens Petersen - 0.1.4.6-2 - rebuild From c96e0d56571b980089d36328d5021b1061079242 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 13 Jun 2012 19:05:19 +0900 Subject: [PATCH 06/61] update to 0.2.1.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0c8df2a..45219ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /unordered-containers-0.1.4.3.tar.gz /unordered-containers-0.1.4.6.tar.gz +/unordered-containers-0.2.1.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 1ad260e..746427d 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -12,8 +12,8 @@ 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.6 -Release: 3%{?dist} +Version: 0.2.1.0 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -56,6 +56,9 @@ BuildRequires: ghc-hashable-prof %changelog +* Wed Jun 13 2012 Jens Petersen - 0.2.1.0-1 +- update to 0.2.1.0 + * Fri Mar 23 2012 Jens Petersen - 0.1.4.6-3 - add license to ghc_files diff --git a/sources b/sources index cf67fc7..afd264c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6909de725813a2086bf2f3b69bc43459 unordered-containers-0.1.4.6.tar.gz +13c4ff652683e00ed17e18b080e9893b unordered-containers-0.2.1.0.tar.gz From a9e717909ee0bd73aa63cf18cf38131889a7f2c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2012 11:15:49 +0900 Subject: [PATCH 07/61] change prof BRs to devel --- ghc-unordered-containers.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 746427d..fec0e0c 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -13,7 +13,7 @@ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} Version: 0.2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,8 +25,8 @@ ExclusiveArch: %{ghc_arches} BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} # END cabal2spec -BuildRequires: ghc-deepseq-prof -BuildRequires: ghc-hashable-prof +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-hashable-devel %description %{common_description} @@ -56,6 +56,9 @@ BuildRequires: ghc-hashable-prof %changelog +* Mon Jul 16 2012 Jens Petersen - 0.2.1.0-2 +- change prof BRs to devel + * Wed Jun 13 2012 Jens Petersen - 0.2.1.0-1 - update to 0.2.1.0 From e4de484c4b5fa7a3cae9eafc6f043fd17fcebc70 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 01:17:45 -0500 Subject: [PATCH 08/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index fec0e0c..0d3c3a0 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -13,7 +13,7 @@ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} Version: 0.2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -56,6 +56,9 @@ BuildRequires: ghc-hashable-devel %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Jens Petersen - 0.2.1.0-2 - change prof BRs to devel From 46feb0fcb97d01f818f60191db72d85a26b667c4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Nov 2012 17:20:11 +0900 Subject: [PATCH 09/61] update to 0.2.2.1 --- .gitignore | 1 + ghc-unordered-containers.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 45219ff..0928288 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /unordered-containers-0.1.4.3.tar.gz /unordered-containers-0.1.4.6.tar.gz /unordered-containers-0.2.1.0.tar.gz +/unordered-containers-0.2.2.1.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 0d3c3a0..8845d23 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,3 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell @@ -12,21 +11,20 @@ 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.2.1.0 -Release: 3%{?dist} +Version: 0.2.2.1 +Release: 1%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries 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 -ExclusiveArch: %{ghc_arches} + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel +# End cabal-rpm deps %description %{common_description} @@ -56,6 +54,9 @@ BuildRequires: ghc-hashable-devel %changelog +* Thu Nov 08 2012 Jens Petersen - 0.2.2.1-1 +- update to 0.2.2.1 + * Thu Jul 19 2012 Fedora Release Engineering - 0.2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index afd264c..b8d537e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c4ff652683e00ed17e18b080e9893b unordered-containers-0.2.1.0.tar.gz +8f42f0c7bcc9d571dfbc3ff669798e14 unordered-containers-0.2.2.1.tar.gz From b8c9f491a9f9b0f6db14c813abde8e4d618356a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:21:13 -0600 Subject: [PATCH 10/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 8845d23..578900c 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -12,7 +12,7 @@ amortized, but remains valid even if structures are shared. Name: ghc-%{pkg_name} Version: 0.2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} License: BSD @@ -54,6 +54,9 @@ BuildRequires: ghc-hashable-devel %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Nov 08 2012 Jens Petersen - 0.2.2.1-1 - update to 0.2.2.1 From 0214ac44afc708b293490abf99f7645d75ffa75f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 13 Mar 2013 00:26:33 +0900 Subject: [PATCH 11/61] update to 0.2.3.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0928288..2ba3e17 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /unordered-containers-0.1.4.6.tar.gz /unordered-containers-0.2.1.0.tar.gz /unordered-containers-0.2.2.1.tar.gz +/unordered-containers-0.2.3.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 578900c..dc00774 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -11,8 +11,8 @@ 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.2.2.1 -Release: 2%{?dist} +Version: 0.2.3.0 +Release: 1%{?dist} Summary: %{common_summary} License: BSD @@ -54,6 +54,9 @@ BuildRequires: ghc-hashable-devel %changelog +* Tue Mar 12 2013 Jens Petersen - 0.2.3.0-1 +- update to 0.2.3.0 + * Wed Feb 13 2013 Fedora Release Engineering - 0.2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index b8d537e..0113eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f42f0c7bcc9d571dfbc3ff669798e14 unordered-containers-0.2.2.1.tar.gz +736ee6396ad6b2330259787984472052 unordered-containers-0.2.3.0.tar.gz From 84efe8db4fd77f0bebccfd49887c3a692f26e596 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 May 2013 22:00:48 +0900 Subject: [PATCH 12/61] update to cabal-rpm-0.8.0 now part of Haskell Platform 2013.2 --- ghc-unordered-containers.spec | 42 +++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index dc00774..94decec 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,19 +1,12 @@ # https://fedoraproject.org/wiki/Packaging:Haskell -# https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name unordered-containers -%global common_summary Efficient hashing-based container types - -%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} +# part of haskell-platform-2013.2 Version: 0.2.3.0 Release: 1%{?dist} -Summary: %{common_summary} +Summary: Efficient hashing-based container types License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} @@ -27,8 +20,24 @@ BuildRequires: ghc-hashable-devel # End cabal-rpm deps %description -%{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. + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: %{ghc_compiler} +Requires(post): %{ghc_compiler} +Requires(postun): %{ghc_compiler} +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the Haskell unordered-containers library +development files. %prep %setup -q -n %{pkg_name}-%{version} @@ -42,20 +51,25 @@ BuildRequires: ghc-hashable-devel %ghc_lib_install -%ghc_devel_package +%post devel +%ghc_pkg_recache + -%ghc_devel_description +%postun devel +%ghc_pkg_recache -%ghc_devel_post_postun +%files -f %{name}.files +%doc LICENSE -%ghc_files LICENSE +%files devel -f %{name}-devel.files %changelog * Tue Mar 12 2013 Jens Petersen - 0.2.3.0-1 - update to 0.2.3.0 +- part of haskell-platform-2013.2 * Wed Feb 13 2013 Fedora Release Engineering - 0.2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 2c3c5b6787f6436e12fa1a1984ad12695973e2ee Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 4 Jun 2013 18:31:34 +0900 Subject: [PATCH 13/61] drop ghc_compiler and use pkg_name in devel description --- ghc-unordered-containers.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 94decec..a0b8eb9 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -30,13 +30,13 @@ amortized, but remains valid even if structures are shared. %package devel Summary: Haskell %{pkg_name} library development files -Requires: %{ghc_compiler} -Requires(post): %{ghc_compiler} -Requires(postun): %{ghc_compiler} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} Requires: %{name} = %{version}-%{release} %description devel -This package provides the Haskell unordered-containers library +This package provides the Haskell %{pkg_name} library development files. %prep From 40315ae4b63cf1a860ef559b3aeca112fad4aee5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 20 Jun 2013 10:12:47 +0900 Subject: [PATCH 14/61] bump release --- ghc-unordered-containers.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index a0b8eb9..d3f346e 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2013.2 Version: 0.2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -67,9 +67,12 @@ development files. %changelog +* Thu Jun 20 2013 Jens Petersen - 0.2.3.0-2 +- update to cabal-rpm-0.8 +- part of haskell-platform-2013.2 + * Tue Mar 12 2013 Jens Petersen - 0.2.3.0-1 - update to 0.2.3.0 -- part of haskell-platform-2013.2 * Wed Feb 13 2013 Fedora Release Engineering - 0.2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 60711215e35d9d0cd77e64559cd2a8c8c2dcb43f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:07:34 -0500 Subject: [PATCH 15/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index d3f346e..b8c781f 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -5,7 +5,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2013.2 Version: 0.2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -67,6 +67,9 @@ development files. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Jun 20 2013 Jens Petersen - 0.2.3.0-2 - update to cabal-rpm-0.8 - part of haskell-platform-2013.2 From b10ac064b709dc4a840943bd74062553a11bf0c4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 31 May 2014 00:32:26 +0900 Subject: [PATCH 16/61] update to 0.2.3.3 for ghc-7.8 --- .gitignore | 1 + ghc-unordered-containers.spec | 41 +++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2ba3e17..cd5ed6c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /unordered-containers-0.2.1.0.tar.gz /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz +/unordered-containers-0.2.3.3.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index b8c781f..b3efee2 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -2,21 +2,37 @@ %global pkg_name unordered-containers +%bcond_with tests + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} -# part of haskell-platform-2013.2 -Version: 0.2.3.0 -Release: 3%{?dist} +# part of haskell-platform +Version: 0.2.3.3 +Release: 1%{?dist} Summary: Efficient hashing-based container types 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 +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel +%if %{with tests} +BuildRequires: ghc-ChasingBottoms-devel +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -30,14 +46,16 @@ amortized, but remains valid even if structures are shared. %package devel Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -This package provides the Haskell %{pkg_name} library -development files. +This package provides the Haskell %{pkg_name} library development +files. + %prep %setup -q -n %{pkg_name}-%{version} @@ -51,6 +69,12 @@ development files. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -67,6 +91,9 @@ development files. %changelog +* Fri May 30 2014 Jens Petersen - 0.2.3.3-1 +- update to 0.2.3.3 + * Sat Aug 03 2013 Fedora Release Engineering - 0.2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 0113eb5..83f4511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -736ee6396ad6b2330259787984472052 unordered-containers-0.2.3.0.tar.gz +e1ccd76f0ce7935e83b27a16062f654f unordered-containers-0.2.3.3.tar.gz From 3f4ad05a27b03199a29b2bfc2de69f695539d055 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 6 Jun 2014 02:17:44 +0900 Subject: [PATCH 17/61] opt out of f21 mass rebuild due to changes staged for ghc78 --- noautobuild | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 noautobuild diff --git a/noautobuild b/noautobuild new file mode 100644 index 0000000..e69de29 From d1d791f7d8ac20cc60b351b45fcbccd929ca244b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Jun 2014 18:42:15 +0900 Subject: [PATCH 18/61] remove noautobuild --- noautobuild | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 noautobuild diff --git a/noautobuild b/noautobuild deleted file mode 100644 index e69de29..0000000 From 149c08a54dbdf91476d6591a26a06891e463d097 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 19 Jun 2014 18:43:17 +0900 Subject: [PATCH 19/61] revert to 0.2.3.0 until ghc-7.8 ready --- .gitignore | 1 - ghc-unordered-containers.spec | 8 ++++---- sources | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index cd5ed6c..2ba3e17 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /unordered-containers-0.2.1.0.tar.gz /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz -/unordered-containers-0.2.3.3.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index b3efee2..673b0f7 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,8 +9,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.3.3 -Release: 1%{?dist} +Version: 0.2.3.0 +Release: 4%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -91,8 +91,8 @@ files. %changelog -* Fri May 30 2014 Jens Petersen - 0.2.3.3-1 -- update to 0.2.3.3 +* Thu Jun 19 2014 Jens Petersen - 0.2.3.0-4 +- update packaging to cblrpm-0.8.11 * Sat Aug 03 2013 Fedora Release Engineering - 0.2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 83f4511..0113eb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1ccd76f0ce7935e83b27a16062f654f unordered-containers-0.2.3.3.tar.gz +736ee6396ad6b2330259787984472052 unordered-containers-0.2.3.0.tar.gz From d3f2f662dd289221da840b4eb0ca88c1f1df84ef Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 8 Aug 2014 15:07:50 +0200 Subject: [PATCH 20/61] update to 0.2.4.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ba3e17..56e4c07 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /unordered-containers-0.2.1.0.tar.gz /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz +/unordered-containers-0.2.4.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 673b0f7..116e886 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,8 +9,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.3.0 -Release: 4%{?dist} +Version: 0.2.4.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -91,6 +91,9 @@ files. %changelog +* Fri Aug 8 2014 Jens Petersen - 0.2.4.0-1 +- update to 0.2.4.0 + * Thu Jun 19 2014 Jens Petersen - 0.2.3.0-4 - update packaging to cblrpm-0.8.11 diff --git a/sources b/sources index 0113eb5..45d090b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -736ee6396ad6b2330259787984472052 unordered-containers-0.2.3.0.tar.gz +baf4b01faa89f9efdae6c932c8c701ad unordered-containers-0.2.4.0.tar.gz From d7189abcd2739690b4fc0d058b1280694acbe3bc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 16:04:30 +0000 Subject: [PATCH 21/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 116e886..c01bd66 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -91,6 +91,9 @@ files. %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 0.2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Jens Petersen - 0.2.4.0-1 - update to 0.2.4.0 From a6a50eaed33b8cbf33ef36ccc3d9d5549b161d4a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Jan 2015 00:13:24 +0900 Subject: [PATCH 22/61] cblrpm refresh --- ghc-unordered-containers.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index c01bd66..9076870 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -4,18 +4,15 @@ %bcond_with tests -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} - Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.4.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD -URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -36,12 +33,12 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %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. +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. +The declared cost of each operation is either worst-case or amortized, +but remains valid even if structures are shared. %package devel @@ -91,9 +88,6 @@ files. %changelog -* Sat Aug 16 2014 Fedora Release Engineering - 0.2.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - * Fri Aug 8 2014 Jens Petersen - 0.2.4.0-1 - update to 0.2.4.0 From 2c0324975a27aeedeb4b4c3460a1b58863145e7e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:04:00 +0000 Subject: [PATCH 23/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 9076870..079b9f3 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -88,6 +88,9 @@ files. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Aug 8 2014 Jens Petersen - 0.2.4.0-1 - update to 0.2.4.0 From 890da13b3cf48bd363d98c31ac2c075bd253e813 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Sep 2015 18:25:10 +0900 Subject: [PATCH 24/61] update to 0.2.5.1 --- .gitignore | 1 + ghc-unordered-containers.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 56e4c07..747f7b0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz /unordered-containers-0.2.4.0.tar.gz +/unordered-containers-0.2.5.1.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 079b9f3..9c60469 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.4.0 -Release: 2%{?dist} +Version: 0.2.5.1 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -33,12 +33,12 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %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. +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. +The declared cost of each operation is either worst-case or amortized, but +remains valid even if structures are shared. %package devel @@ -65,6 +65,8 @@ files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -81,13 +83,16 @@ files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Thu Sep 17 2015 Jens Petersen - 0.2.5.1-1 +- update to 0.2.5.1 + * Wed Jun 17 2015 Fedora Release Engineering - 0.2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 45d090b..a6f658e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -baf4b01faa89f9efdae6c932c8c701ad unordered-containers-0.2.4.0.tar.gz +c330100ca1d5e6b3cb8242d0bde706f9 unordered-containers-0.2.5.1.tar.gz From 3a2c51e9344c57d364ed87ef4d8331fb7bd4f549 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:41:06 +0900 Subject: [PATCH 25/61] Reverting "update to 0.2.5.1" This reverts commit 890da13b3cf48bd363d98c31ac2c075bd253e813. --- .gitignore | 1 - ghc-unordered-containers.spec | 21 ++++++++------------- sources | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 747f7b0..56e4c07 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz /unordered-containers-0.2.4.0.tar.gz -/unordered-containers-0.2.5.1.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 9c60469..079b9f3 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.5.1 -Release: 1%{?dist} +Version: 0.2.4.0 +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -33,12 +33,12 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %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. +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. +The declared cost of each operation is either worst-case or amortized, +but remains valid even if structures are shared. %package devel @@ -65,8 +65,6 @@ files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check %if %{with tests} @@ -83,16 +81,13 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files %changelog -* Thu Sep 17 2015 Jens Petersen - 0.2.5.1-1 -- update to 0.2.5.1 - * Wed Jun 17 2015 Fedora Release Engineering - 0.2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a6f658e..45d090b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c330100ca1d5e6b3cb8242d0bde706f9 unordered-containers-0.2.5.1.tar.gz +baf4b01faa89f9efdae6c932c8c701ad unordered-containers-0.2.4.0.tar.gz From 62e03d6471830ec8fa6a8372202251ce546bc329 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 21:47:30 +0000 Subject: [PATCH 26/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 079b9f3..f0328cb 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -88,6 +88,9 @@ files. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 0.2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d2e879c201c68c487f9fc14027976ce156083a39 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2016 11:21:16 +0900 Subject: [PATCH 27/61] update to 0.2.5.1 This reverts commit 3a2c51e9344c57d364ed87ef4d8331fb7bd4f549. --- .gitignore | 1 + ghc-unordered-containers.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 56e4c07..747f7b0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /unordered-containers-0.2.2.1.tar.gz /unordered-containers-0.2.3.0.tar.gz /unordered-containers-0.2.4.0.tar.gz +/unordered-containers-0.2.5.1.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index f0328cb..bb5bf99 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -6,8 +6,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.4.0 -Release: 3%{?dist} +Version: 0.2.5.1 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -33,12 +33,12 @@ BuildRequires: ghc-test-framework-quickcheck2-devel # End cabal-rpm deps %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. +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. +The declared cost of each operation is either worst-case or amortized, but +remains valid even if structures are shared. %package devel @@ -65,6 +65,8 @@ files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -81,13 +83,16 @@ files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %changelog +* Tue Jun 7 2016 Jens Petersen - 0.2.5.1-1 +- update to 0.2.5.1 + * Wed Feb 03 2016 Fedora Release Engineering - 0.2.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 45d090b..a6f658e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -baf4b01faa89f9efdae6c932c8c701ad unordered-containers-0.2.4.0.tar.gz +c330100ca1d5e6b3cb8242d0bde706f9 unordered-containers-0.2.5.1.tar.gz From 62d7fa05292c82beb6e6631f00d797a2d0945e9c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 26 Jun 2016 19:25:56 +0900 Subject: [PATCH 28/61] update to 0.2.7.1 --- .gitignore | 1 + ghc-unordered-containers.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 747f7b0..6128d0e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /unordered-containers-0.2.3.0.tar.gz /unordered-containers-0.2.4.0.tar.gz /unordered-containers-0.2.5.1.tar.gz +/unordered-containers-0.2.7.1.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index bb5bf99..28fa2be 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,3 +1,4 @@ +# generated by cabal-rpm-0.9.11 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -6,7 +7,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.5.1 +Version: 0.2.7.1 Release: 1%{?dist} Summary: Efficient hashing-based container types @@ -24,11 +25,9 @@ BuildRequires: ghc-ChasingBottoms-devel BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-containers-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel -BuildRequires: ghc-test-framework-quickcheck2-devel %endif # End cabal-rpm deps @@ -90,6 +89,9 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog +* Sun Jun 26 2016 Jens Petersen - 0.2.7.1-1 +- update to 0.2.7.1 + * Tue Jun 7 2016 Jens Petersen - 0.2.5.1-1 - update to 0.2.5.1 diff --git a/sources b/sources index a6f658e..f82b20b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c330100ca1d5e6b3cb8242d0bde706f9 unordered-containers-0.2.5.1.tar.gz +318991f285ff276798de9d8b6d50e5f9 unordered-containers-0.2.7.1.tar.gz From a8b0cd4f5a4f67e0143077ae2ec22480a1bda251 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 27 Sep 2016 19:15:54 +0900 Subject: [PATCH 29/61] no longer remove license; use cabal_test --- ghc-unordered-containers.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 28fa2be..ecfe81c 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -64,13 +64,9 @@ files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE - %check -%if %{with tests} -%cabal test -%endif +%cabal_test %post devel From db744c083ae21aab59e02b9a8167c13ade5352e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:52:05 +0000 Subject: [PATCH 30/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index ecfe81c..947e0e5 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -85,6 +85,9 @@ files. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jun 26 2016 Jens Petersen - 0.2.7.1-1 - update to 0.2.7.1 From e60759aaa8de33bfc1ed88144b5e31a35d470aab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 21 Feb 2017 22:24:28 +0900 Subject: [PATCH 31/61] update to 0.2.7.2 --- .gitignore | 1 + ghc-unordered-containers.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6128d0e..bc97d58 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /unordered-containers-0.2.4.0.tar.gz /unordered-containers-0.2.5.1.tar.gz /unordered-containers-0.2.7.1.tar.gz +/unordered-containers-0.2.7.2.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 947e0e5..db014c6 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,19 +1,20 @@ -# generated by cabal-rpm-0.9.11 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.7.1 -Release: 2%{?dist} +Version: 0.2.7.2 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -54,7 +55,7 @@ files. %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} %build @@ -82,9 +83,13 @@ files. %files devel -f %{name}-devel.files +%doc CHANGES.md %changelog +* Tue Feb 21 2017 Jens Petersen - 0.2.7.2-1 +- update to 0.2.7.2 + * Fri Feb 10 2017 Fedora Release Engineering - 0.2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index f82b20b..7104f99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -318991f285ff276798de9d8b6d50e5f9 unordered-containers-0.2.7.1.tar.gz +SHA512 (unordered-containers-0.2.7.2.tar.gz) = 622eeaf2355a01cc0b8caab2f75fe79bae5b5039b189a5463d519a91e244d4786b91fb319c04cbd8f666e7faeb8a2780c71d37a1b4a4b3da4c42511fba1fc453 From 539e003588f858bb3330ee02b26697d06ff6cdf3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:00:00 +0000 Subject: [PATCH 32/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index db014c6..caf637f 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -87,6 +87,9 @@ files. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.2.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Feb 21 2017 Jens Petersen - 0.2.7.2-1 - update to 0.2.7.2 From 217f70bc6f1f90ba33e3c85ba312c1052d79f195 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 21:35:42 +0000 Subject: [PATCH 33/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index caf637f..8e1ea73 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -87,6 +87,9 @@ files. %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.2.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.2.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bbf07b1c75075e218174073e1b609ad083caaffe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 14:12:14 +0100 Subject: [PATCH 34/61] refresh to cabal-rpm-0.12.1 --- ghc-unordered-containers.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 8e1ea73..6df820b 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -44,9 +44,12 @@ remains valid even if structures are shared. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -70,6 +73,12 @@ files. %cabal_test +%post -p /sbin/ldconfig + + +%postun -p /sbin/ldconfig + + %post devel %ghc_pkg_recache From 5d6f4781e0db86c44c2aca02ef453423833f93a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jan 2018 15:58:09 +0100 Subject: [PATCH 35/61] update to 0.2.8.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc97d58..3e9b0eb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /unordered-containers-0.2.5.1.tar.gz /unordered-containers-0.2.7.1.tar.gz /unordered-containers-0.2.7.2.tar.gz +/unordered-containers-0.2.8.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 6df820b..68c3be8 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,8 +8,8 @@ Name: ghc-%{pkg_name} # part of haskell-platform -Version: 0.2.7.2 -Release: 3%{?dist} +Version: 0.2.8.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -96,6 +96,9 @@ files. %changelog +* Wed Jan 24 2018 Jens Petersen - 0.2.8.0-1 +- update to 0.2.8.0 + * Wed Aug 02 2017 Fedora Release Engineering - 0.2.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 7104f99..b959ec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.7.2.tar.gz) = 622eeaf2355a01cc0b8caab2f75fe79bae5b5039b189a5463d519a91e244d4786b91fb319c04cbd8f666e7faeb8a2780c71d37a1b4a4b3da4c42511fba1fc453 +SHA512 (unordered-containers-0.2.8.0.tar.gz) = 4cd717aee0519db84dd0f7ac6407df681a1340d7276f3546eb67072e85e464b1c58b427739d66bf28f1075fd8a52310a7637a8169608c2759694196319c36189 From 0c7d6a94bf92b5910a2144c29127ce42b9626c17 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Feb 2018 01:03:41 +0900 Subject: [PATCH 36/61] drop ldconfig scriptlets --- ghc-unordered-containers.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 68c3be8..bcee756 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -73,12 +73,6 @@ files. %cabal_test -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %post devel %ghc_pkg_recache From 4f9f013af1e83378f50e12839fa56da1394a546c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:17:39 +0000 Subject: [PATCH 37/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index bcee756..6041a0b 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -90,6 +90,9 @@ files. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Jens Petersen - 0.2.8.0-1 - update to 0.2.8.0 From fc523760d3d8c99ed2dd3c338f94cdd29104044e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:13:46 +0000 Subject: [PATCH 38/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 6041a0b..70d4ae8 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -9,7 +9,7 @@ Name: ghc-%{pkg_name} # part of haskell-platform Version: 0.2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -90,6 +90,9 @@ files. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2e17c1b55a82941f01657f41cd2c2ec413623d07 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 00:24:28 +0900 Subject: [PATCH 39/61] remove part of haskell-platform comment --- ghc-unordered-containers.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 70d4ae8..d50360d 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,7 +7,6 @@ %bcond_with tests Name: ghc-%{pkg_name} -# part of haskell-platform Version: 0.2.8.0 Release: 3%{?dist} Summary: Efficient hashing-based container types From a560d616cbc411bacaa2417fe26c3d6cf6768068 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jul 2018 23:35:00 +0900 Subject: [PATCH 40/61] update to 0.2.9.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3e9b0eb..2852c77 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /unordered-containers-0.2.7.1.tar.gz /unordered-containers-0.2.7.2.tar.gz /unordered-containers-0.2.8.0.tar.gz +/unordered-containers-0.2.9.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index d50360d..044d4c9 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.1 +# generated by cabal-rpm-0.12.5 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.8.0 -Release: 3%{?dist} +Version: 0.2.9.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -89,6 +89,9 @@ files. %changelog +* Sun Jul 22 2018 Jens Petersen - 0.2.9.0-1 +- update to 0.2.9.0 + * Fri Jul 13 2018 Fedora Release Engineering - 0.2.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index b959ec9..80a6e0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.8.0.tar.gz) = 4cd717aee0519db84dd0f7ac6407df681a1340d7276f3546eb67072e85e464b1c58b427739d66bf28f1075fd8a52310a7637a8169608c2759694196319c36189 +SHA512 (unordered-containers-0.2.9.0.tar.gz) = d9fb6d173f7d07494cffeffa74d3827e4011957be7f309e9f9c16d484b46d04824a21269185d340b09d65d386d19fd5f6b78a51036a5292e5d33e29819fd225a From b2a0c3737ff408aac0f221d0471f26a8895243ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:10:33 +0000 Subject: [PATCH 41/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 044d4c9..63f4b1a 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -89,6 +89,9 @@ files. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jens Petersen - 0.2.9.0-1 - update to 0.2.9.0 From 3bcd9f1318c0ca2f35dd313a846f853df91828b7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:47:40 +0800 Subject: [PATCH 42/61] refresh to cabal-rpm-0.13 --- ghc-unordered-containers.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 63f4b1a..e942e50 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -8,16 +8,18 @@ Name: ghc-%{pkg_name} Version: 0.2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel %if %{with tests} @@ -57,15 +59,21 @@ files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %check @@ -81,7 +89,9 @@ files. %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -89,6 +99,9 @@ files. %changelog +* Sun Feb 17 2019 Jens Petersen - 0.2.9.0-3 +- refresh to cabal-rpm-0.13 + * Thu Jan 31 2019 Fedora Release Engineering - 0.2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dc093e825ab3783634dec326876be9ac3c571776 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:10:00 +0000 Subject: [PATCH 43/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index e942e50..2a6c909 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.9.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -99,6 +99,9 @@ files. %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Jens Petersen - 0.2.9.0-3 - refresh to cabal-rpm-0.13 From 1aea8ab528228af78337f840c490752072b2ad8d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 04:26:38 +0000 Subject: [PATCH 44/61] refresh to cabal-rpm-1.0.0: lib doc/prof subpkgs and bin static BRs --- ghc-unordered-containers.spec | 49 ++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 2a6c909..eb36b74 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.13 +# generated by cabal-rpm-1.0.0 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -19,6 +19,12 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel +%if %{with haddock} +BuildRequires: ghc-doc +%endif +%if %{with ghc_prof} +BuildRequires: ghc-prof +%endif BuildRequires: ghc-rpm-macros BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel @@ -45,11 +51,8 @@ remains valid even if structures are shared. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} -Requires(post): ghc-compiler = %{ghc_version} -Requires(postun): ghc-compiler = %{ghc_version} %endif Requires: %{name}%{?_isa} = %{version}-%{release} @@ -58,6 +61,26 @@ This package provides the Haskell %{pkg_name} library development files. +%if %{with haddock} +%package doc +Summary: Haskell %{pkg_name} library documentation + +%description doc +This package provides the Haskell %{pkg_name} library +documentation. +%endif + + +%if %{with ghc_prof} +%package prof +Summary: Haskell %{pkg_name} profiling library +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description prof +This package provides the Haskell %{pkg_name} profiling library. +%endif + + %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} @@ -80,14 +103,6 @@ files. %cabal_test -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -98,6 +113,16 @@ files. %doc CHANGES.md +%if %{with haddock} +%files doc -f %{name}-doc.files +%endif + + +%if %{with ghc_prof} +%files prof -f %{name}-prof.files +%endif + + %changelog * Thu Jul 25 2019 Fedora Release Engineering - 0.2.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4977394b2772ddfb23b3a71b2c2663d13086585f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 25 Jul 2019 16:54:28 +0000 Subject: [PATCH 45/61] update to 0.2.10.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 9 +- sources | 2 +- unordered-containers-0.2.10.0.cabal | 219 ++++++++++++++++++++++++++++ 4 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 unordered-containers-0.2.10.0.cabal diff --git a/.gitignore b/.gitignore index 2852c77..44ee044 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /unordered-containers-0.2.7.2.tar.gz /unordered-containers-0.2.8.0.tar.gz /unordered-containers-0.2.9.0.tar.gz +/unordered-containers-0.2.10.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index eb36b74..46676c9 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,14 +7,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.9.0 -Release: 4%{?dist} +Version: 0.2.10.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -84,6 +85,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -124,6 +126,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jul 25 2019 Jens Petersen - 0.2.10.0-1 +- update to 0.2.10.0 + * Thu Jul 25 2019 Fedora Release Engineering - 0.2.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 80a6e0a..7a80eca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.9.0.tar.gz) = d9fb6d173f7d07494cffeffa74d3827e4011957be7f309e9f9c16d484b46d04824a21269185d340b09d65d386d19fd5f6b78a51036a5292e5d33e29819fd225a +SHA512 (unordered-containers-0.2.10.0.tar.gz) = 450e5e839e0092b2476a0abfc3eb2f45fba634a9e782cddf25b3db3730d16dd2e65673f46678ab4ad23be71525ae5f72888b89b03402cb70e20fc33feb765766 diff --git a/unordered-containers-0.2.10.0.cabal b/unordered-containers-0.2.10.0.cabal new file mode 100644 index 0000000..256ed73 --- /dev/null +++ b/unordered-containers-0.2.10.0.cabal @@ -0,0 +1,219 @@ +name: unordered-containers +version: 0.2.10.0 +x-revision: 1 +synopsis: Efficient hashing-based container types +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. +license: BSD3 +license-file: LICENSE +author: Johan Tibell +maintainer: johan.tibell@gmail.com +Homepage: https://github.com/tibbe/unordered-containers +bug-reports: https://github.com/tibbe/unordered-containers/issues +copyright: 2010-2014 Johan Tibell + 2010 Edward Z. Yang +category: Data +build-type: Simple +cabal-version: >=1.10 +extra-source-files: CHANGES.md +tested-with: GHC==8.4.1, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4 + +flag debug + description: Enable debug support + default: False + +library + exposed-modules: + Data.HashMap.Lazy + Data.HashMap.Strict + Data.HashSet + other-modules: + Data.HashMap.Array + Data.HashMap.Base + Data.HashMap.Strict.Base + Data.HashMap.List + Data.HashMap.Unsafe + Data.HashMap.UnsafeShift + Data.HashSet.Base + + build-depends: + base >= 4.7 && < 5, + deepseq >= 1.1, + hashable >= 1.0.1.1 && < 1.4 + + default-language: Haskell2010 + + other-extensions: + RoleAnnotations, + UnboxedTuples, + ScopedTypeVariables, + MagicHash, + BangPatterns + + ghc-options: -Wall -O2 -fwarn-tabs -ferror-spans + + if impl (ghc < 8.2) + -- This is absolutely necessary (but not sufficient) for correctness due to + -- the referential-transparency-breaking mutability in unsafeInsertWith. See + -- #147 and GHC #13615 for details. The bug was fixed in GHC 8.2. + ghc-options: -feager-blackholing + if flag(debug) + cpp-options: -DASSERTS + +test-suite hashmap-lazy-properties + hs-source-dirs: tests + main-is: HashMapProperties.hs + type: exitcode-stdio-1.0 + + build-depends: + base, + containers >= 0.5.8, + hashable >= 1.0.1.1, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-quickcheck2 >= 0.2.9, + unordered-containers + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS + +test-suite hashmap-strict-properties + hs-source-dirs: tests + main-is: HashMapProperties.hs + type: exitcode-stdio-1.0 + + build-depends: + base, + containers >= 0.5.8, + hashable >= 1.0.1.1, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-quickcheck2 >= 0.2.9, + unordered-containers + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS -DSTRICT + +test-suite hashset-properties + hs-source-dirs: tests + main-is: HashSetProperties.hs + type: exitcode-stdio-1.0 + + build-depends: + base, + containers >= 0.4, + hashable >= 1.0.1.1, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-quickcheck2 >= 0.2.9, + unordered-containers + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS + +test-suite list-tests + hs-source-dirs: tests . + main-is: List.hs + other-modules: + Data.HashMap.List + type: exitcode-stdio-1.0 + + build-depends: + base, + containers >= 0.4, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-quickcheck2 >= 0.2.9 + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS + +test-suite regressions + hs-source-dirs: tests + main-is: Regressions.hs + type: exitcode-stdio-1.0 + + build-depends: + base, + hashable >= 1.0.1.1, + HUnit, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-hunit, + test-framework-quickcheck2, + unordered-containers + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS + +test-suite strictness-properties + hs-source-dirs: tests + main-is: Strictness.hs + type: exitcode-stdio-1.0 + + build-depends: + base, + ChasingBottoms, + containers >= 0.4.2, + hashable >= 1.0.1.1, + QuickCheck >= 2.4.0.1, + test-framework >= 0.3.3, + test-framework-quickcheck2 >= 0.2.9, + unordered-containers + + default-language: Haskell2010 + ghc-options: -Wall + cpp-options: -DASSERTS + +benchmark benchmarks + -- We cannot depend on the unordered-containers library directly as + -- that creates a dependency cycle. + hs-source-dirs: . benchmarks + + main-is: Benchmarks.hs + type: exitcode-stdio-1.0 + + other-modules: + Data.HashMap.Array + Data.HashMap.Base + Data.HashMap.Lazy + Data.HashMap.Strict + Data.HashMap.Strict.Base + Data.HashMap.Unsafe + Data.HashMap.UnsafeShift + Data.HashSet + Data.HashSet.Base + Util.ByteString + Util.Int + Util.String + + build-depends: + base >= 4.8.0, + bytestring, + containers, + criterion >= 1.0 && < 1.3, + deepseq >= 1.1, + deepseq-generics, + hashable >= 1.0.1.1, + hashmap, + mtl, + random + + default-language: Haskell2010 + ghc-options: -Wall -O2 -rtsopts -fwarn-tabs -ferror-spans + if flag(debug) + cpp-options: -DASSERTS + +source-repository head + type: git + location: https://github.com/tibbe/unordered-containers.git From 0886db2f7999c0bbe83fd08c94f236e8c9b54e1d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:32:37 +0800 Subject: [PATCH 46/61] BR prof for lib and static for executable --- ghc-unordered-containers.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 46676c9..62ea06c 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.0 +# generated by cabal-rpm-1.0.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers @@ -20,15 +20,10 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-hashable-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-hashable-prof %if %{with tests} BuildRequires: ghc-ChasingBottoms-devel BuildRequires: ghc-HUnit-devel @@ -52,6 +47,7 @@ remains valid even if structures are shared. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif From 26e7bbd1a1bcbdba8e58d7d44e10f329f43824d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:36:33 +0000 Subject: [PATCH 47/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 62ea06c..c970839 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -122,6 +122,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.2.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Jens Petersen - 0.2.10.0-1 - update to 0.2.10.0 From 00f7458e500f5ad813bfb84a4f37f8e67e52ef8b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 8 Feb 2020 22:52:36 +0800 Subject: [PATCH 48/61] refresh to cabal-rpm-2.0.2 --- ghc-unordered-containers.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index c970839..784031a 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,11 +1,9 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name unordered-containers %global pkgver %{pkg_name}-%{version} -%bcond_with tests - Name: ghc-%{pkg_name} Version: 0.2.10.0 Release: 2%{?dist} @@ -24,15 +22,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-hashable-prof -%if %{with tests} -BuildRequires: ghc-ChasingBottoms-devel -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel -%endif # End cabal-rpm deps %description @@ -61,6 +50,7 @@ files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library @@ -72,6 +62,7 @@ documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -97,8 +88,14 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%check -%cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif %files -f %{name}.files @@ -113,6 +110,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif From be5039241fe416d211171191dbde7c5a28b3e745 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 4 Jun 2020 19:28:49 +0800 Subject: [PATCH 49/61] refresh to cabal-rpm-2.0.5 --- ghc-unordered-containers.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 784031a..7a2c0c5 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,5 +1,5 @@ -# generated by cabal-rpm-2.0.2 -# https://fedoraproject.org/wiki/Packaging:Haskell +# generated by cabal-rpm-2.0.5 +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name unordered-containers %global pkgver %{pkg_name}-%{version} From 90e3a172416a2ce164f75a10ea41bf600fa7dc2f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 19 Jun 2020 16:57:28 +0800 Subject: [PATCH 50/61] refresh to cabal-rpm-2.0.6 --- ghc-unordered-containers.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 7a2c0c5..dec3505 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,9 +1,11 @@ -# generated by cabal-rpm-2.0.5 +# generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name unordered-containers %global pkgver %{pkg_name}-%{version} +# testsuite missing deps: test-framework test-framework-quickcheck2 test-framework-hunit ChasingBottoms + Name: ghc-%{pkg_name} Version: 0.2.10.0 Release: 2%{?dist} @@ -88,16 +90,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%if 0%{?fedora} < 31 || 0%{?rhel} < 8 -%post devel -%ghc_pkg_recache - - -%postun devel -%ghc_pkg_recache -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE From a4afa473f65b9277159a5d6544576f65ffbd883f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 17 Jul 2020 18:45:52 +0800 Subject: [PATCH 51/61] bump release --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index dec3505..6b15c92 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -112,6 +112,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Jul 17 2020 Jens Petersen - 0.2.10.0-3 +- refresh to cabal-rpm-2.0.6 + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 62817d63a028b3a8a84cedfb6f5e2fc4b6013246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:49:01 +0000 Subject: [PATCH 52/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 6b15c92..760987a 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -112,6 +112,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.2.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 17 2020 Jens Petersen - 0.2.10.0-3 - refresh to cabal-rpm-2.0.6 From 940a9086981e1be92a364b5af9674929bb4e9358 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:38:52 +0000 Subject: [PATCH 53/61] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 760987a..ec7d272 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -112,6 +112,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.2.10.0-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.2.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6ae9c459328a52a1feddc4f74783cc54d5236d1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 07:52:54 +0000 Subject: [PATCH 54/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index ec7d272..73a137b 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -112,6 +112,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.10.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 0.2.10.0-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 85561d64d8bced33d4f5b75742801e929455d50f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:25:01 +0000 Subject: [PATCH 55/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 73a137b..a72bdee 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.10.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -112,6 +112,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.2.10.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.2.10.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3dc38d70c9e23c99f2ed3b212130975345b1eab7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jan 2021 11:02:00 +0800 Subject: [PATCH 56/61] update to 0.2.13.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 9 +- sources | 2 +- unordered-containers-0.2.10.0.cabal | 219 ---------------------------- 4 files changed, 7 insertions(+), 224 deletions(-) delete mode 100644 unordered-containers-0.2.10.0.cabal diff --git a/.gitignore b/.gitignore index 44ee044..566125d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /unordered-containers-0.2.8.0.tar.gz /unordered-containers-0.2.9.0.tar.gz /unordered-containers-0.2.10.0.tar.gz +/unordered-containers-0.2.13.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index a72bdee..371ff99 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,15 +7,14 @@ # testsuite missing deps: test-framework test-framework-quickcheck2 test-framework-hunit ChasingBottoms Name: ghc-%{pkg_name} -Version: 0.2.10.0 -Release: 7%{?dist} +Version: 0.2.13.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -74,7 +73,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -112,6 +110,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 0.2.13.0-1 +- update to 0.2.13.0 + * Thu Jul 22 2021 Fedora Release Engineering - 0.2.10.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 7a80eca..caa0dfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.10.0.tar.gz) = 450e5e839e0092b2476a0abfc3eb2f45fba634a9e782cddf25b3db3730d16dd2e65673f46678ab4ad23be71525ae5f72888b89b03402cb70e20fc33feb765766 +SHA512 (unordered-containers-0.2.13.0.tar.gz) = f32d6e91ba7ef54cc24562e26e8bda147e43b954966bae3f9850b0c57438e5d8af43f7a49106980d1197ff674eca7bb9a50c8895deb0e45588ec123664c6c47d diff --git a/unordered-containers-0.2.10.0.cabal b/unordered-containers-0.2.10.0.cabal deleted file mode 100644 index 256ed73..0000000 --- a/unordered-containers-0.2.10.0.cabal +++ /dev/null @@ -1,219 +0,0 @@ -name: unordered-containers -version: 0.2.10.0 -x-revision: 1 -synopsis: Efficient hashing-based container types -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. -license: BSD3 -license-file: LICENSE -author: Johan Tibell -maintainer: johan.tibell@gmail.com -Homepage: https://github.com/tibbe/unordered-containers -bug-reports: https://github.com/tibbe/unordered-containers/issues -copyright: 2010-2014 Johan Tibell - 2010 Edward Z. Yang -category: Data -build-type: Simple -cabal-version: >=1.10 -extra-source-files: CHANGES.md -tested-with: GHC==8.4.1, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4 - -flag debug - description: Enable debug support - default: False - -library - exposed-modules: - Data.HashMap.Lazy - Data.HashMap.Strict - Data.HashSet - other-modules: - Data.HashMap.Array - Data.HashMap.Base - Data.HashMap.Strict.Base - Data.HashMap.List - Data.HashMap.Unsafe - Data.HashMap.UnsafeShift - Data.HashSet.Base - - build-depends: - base >= 4.7 && < 5, - deepseq >= 1.1, - hashable >= 1.0.1.1 && < 1.4 - - default-language: Haskell2010 - - other-extensions: - RoleAnnotations, - UnboxedTuples, - ScopedTypeVariables, - MagicHash, - BangPatterns - - ghc-options: -Wall -O2 -fwarn-tabs -ferror-spans - - if impl (ghc < 8.2) - -- This is absolutely necessary (but not sufficient) for correctness due to - -- the referential-transparency-breaking mutability in unsafeInsertWith. See - -- #147 and GHC #13615 for details. The bug was fixed in GHC 8.2. - ghc-options: -feager-blackholing - if flag(debug) - cpp-options: -DASSERTS - -test-suite hashmap-lazy-properties - hs-source-dirs: tests - main-is: HashMapProperties.hs - type: exitcode-stdio-1.0 - - build-depends: - base, - containers >= 0.5.8, - hashable >= 1.0.1.1, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-quickcheck2 >= 0.2.9, - unordered-containers - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS - -test-suite hashmap-strict-properties - hs-source-dirs: tests - main-is: HashMapProperties.hs - type: exitcode-stdio-1.0 - - build-depends: - base, - containers >= 0.5.8, - hashable >= 1.0.1.1, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-quickcheck2 >= 0.2.9, - unordered-containers - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS -DSTRICT - -test-suite hashset-properties - hs-source-dirs: tests - main-is: HashSetProperties.hs - type: exitcode-stdio-1.0 - - build-depends: - base, - containers >= 0.4, - hashable >= 1.0.1.1, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-quickcheck2 >= 0.2.9, - unordered-containers - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS - -test-suite list-tests - hs-source-dirs: tests . - main-is: List.hs - other-modules: - Data.HashMap.List - type: exitcode-stdio-1.0 - - build-depends: - base, - containers >= 0.4, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-quickcheck2 >= 0.2.9 - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS - -test-suite regressions - hs-source-dirs: tests - main-is: Regressions.hs - type: exitcode-stdio-1.0 - - build-depends: - base, - hashable >= 1.0.1.1, - HUnit, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-hunit, - test-framework-quickcheck2, - unordered-containers - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS - -test-suite strictness-properties - hs-source-dirs: tests - main-is: Strictness.hs - type: exitcode-stdio-1.0 - - build-depends: - base, - ChasingBottoms, - containers >= 0.4.2, - hashable >= 1.0.1.1, - QuickCheck >= 2.4.0.1, - test-framework >= 0.3.3, - test-framework-quickcheck2 >= 0.2.9, - unordered-containers - - default-language: Haskell2010 - ghc-options: -Wall - cpp-options: -DASSERTS - -benchmark benchmarks - -- We cannot depend on the unordered-containers library directly as - -- that creates a dependency cycle. - hs-source-dirs: . benchmarks - - main-is: Benchmarks.hs - type: exitcode-stdio-1.0 - - other-modules: - Data.HashMap.Array - Data.HashMap.Base - Data.HashMap.Lazy - Data.HashMap.Strict - Data.HashMap.Strict.Base - Data.HashMap.Unsafe - Data.HashMap.UnsafeShift - Data.HashSet - Data.HashSet.Base - Util.ByteString - Util.Int - Util.String - - build-depends: - base >= 4.8.0, - bytestring, - containers, - criterion >= 1.0 && < 1.3, - deepseq >= 1.1, - deepseq-generics, - hashable >= 1.0.1.1, - hashmap, - mtl, - random - - default-language: Haskell2010 - ghc-options: -Wall -O2 -rtsopts -fwarn-tabs -ferror-spans - if flag(debug) - cpp-options: -DASSERTS - -source-repository head - type: git - location: https://github.com/tibbe/unordered-containers.git From 95b39c5f4849fd3785ee83d0c772507dde27cbdf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 8 Jul 2021 00:30:14 +0800 Subject: [PATCH 57/61] refresh to cabal-rpm-2.0.9 --- ghc-unordered-containers.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 371ff99..5eeb1fd 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.9 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name unordered-containers @@ -52,6 +52,7 @@ files. %package doc Summary: Haskell %{pkg_name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description doc This package provides the Haskell %{pkg_name} library From 6638aea507230493a58841ce62a347ade1fa6202 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 22:45:34 +0800 Subject: [PATCH 58/61] update to 0.2.14.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 566125d..d640b52 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /unordered-containers-0.2.9.0.tar.gz /unordered-containers-0.2.10.0.tar.gz /unordered-containers-0.2.13.0.tar.gz +/unordered-containers-0.2.14.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 5eeb1fd..c95f8a5 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,7 +7,7 @@ # testsuite missing deps: test-framework test-framework-quickcheck2 test-framework-hunit ChasingBottoms Name: ghc-%{pkg_name} -Version: 0.2.13.0 +Version: 0.2.14.0 Release: 1%{?dist} Summary: Efficient hashing-based container types @@ -111,6 +111,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Aug 5 2021 Jens Petersen - 0.2.14.0-1 +- update to 0.2.14.0 + * Thu Aug 5 2021 Jens Petersen - 0.2.13.0-1 - update to 0.2.13.0 diff --git a/sources b/sources index caa0dfb..0ad6545 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.13.0.tar.gz) = f32d6e91ba7ef54cc24562e26e8bda147e43b954966bae3f9850b0c57438e5d8af43f7a49106980d1197ff674eca7bb9a50c8895deb0e45588ec123664c6c47d +SHA512 (unordered-containers-0.2.14.0.tar.gz) = e6ce8d37478db96dedfed2a06b8b7e25dbda275e4ca8523827e8bd8ca2816b3a96f26ea22f2d291bb89b87cf675c706f6b15759dc4e17a63ad94ad63704bc2bf From e0f4aae915f5ee64e671b40b411991e9cb65fcf1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:44:01 +0000 Subject: [PATCH 59/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ghc-unordered-containers.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index c95f8a5..604a28b 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -8,7 +8,7 @@ Name: ghc-%{pkg_name} Version: 0.2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -111,6 +111,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.2.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Aug 5 2021 Jens Petersen - 0.2.14.0-1 - update to 0.2.14.0 From 68dbbc090c0ac742cd544b11405a8d87d4fc1974 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 7 Jun 2022 15:06:46 +0800 Subject: [PATCH 60/61] update to 0.2.16.0 --- .gitignore | 1 + ghc-unordered-containers.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d640b52..c5c5145 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /unordered-containers-0.2.10.0.tar.gz /unordered-containers-0.2.13.0.tar.gz /unordered-containers-0.2.14.0.tar.gz +/unordered-containers-0.2.16.0.tar.gz diff --git a/ghc-unordered-containers.spec b/ghc-unordered-containers.spec index 604a28b..df049c9 100644 --- a/ghc-unordered-containers.spec +++ b/ghc-unordered-containers.spec @@ -7,8 +7,8 @@ # testsuite missing deps: test-framework test-framework-quickcheck2 test-framework-hunit ChasingBottoms Name: ghc-%{pkg_name} -Version: 0.2.14.0 -Release: 2%{?dist} +Version: 0.2.16.0 +Release: 1%{?dist} Summary: Efficient hashing-based container types License: BSD @@ -33,6 +33,12 @@ speed. The declared cost of each operation is either worst-case or amortized, but remains valid even if structures are shared. +/Security/ + +This package currently provides no defenses against hash collision attacks such +as HashDoS. Users who need to store input from untrusted sources are advised to +use 'Data.Map' or 'Data.Set' from the 'containers' package instead. + %package devel Summary: Haskell %{pkg_name} library development files @@ -111,6 +117,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Tue Jun 07 2022 Jens Petersen - 0.2.16.0-1 +- https://hackage.haskell.org/package/unordered-containers-0.2.16.0/changelog + * Thu Jan 20 2022 Fedora Release Engineering - 0.2.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0ad6545..a8875e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unordered-containers-0.2.14.0.tar.gz) = e6ce8d37478db96dedfed2a06b8b7e25dbda275e4ca8523827e8bd8ca2816b3a96f26ea22f2d291bb89b87cf675c706f6b15759dc4e17a63ad94ad63704bc2bf +SHA512 (unordered-containers-0.2.16.0.tar.gz) = 12b3c3d42498e9fba0545196f57dfa851fe141045aafff26701f6e116ba94d7dbc6e2bba1e5ffe47b2532e468c6f41651dfc058ebd3c76e2a16ebef2689d6652 From 8808bb6546ec5fed1d97423e648688e5b5c3edfa Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:07:24 +0300 Subject: [PATCH 61/61] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index a8875e2..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (unordered-containers-0.2.16.0.tar.gz) = 12b3c3d42498e9fba0545196f57dfa851fe141045aafff26701f6e116ba94d7dbc6e2bba1e5ffe47b2532e468c6f41651dfc058ebd3c76e2a16ebef2689d6652