.gitignore

@@ -1,5 +1 @@
 /vector-algorithms-0.7.0.1.tar.gz
-/vector-algorithms-0.7.0.4.tar.gz
-/vector-algorithms-0.8.0.1.tar.gz
-/vector-algorithms-0.8.0.3.tar.gz
-/vector-algorithms-0.8.0.4.tar.gz

changelog

@@ -1,66 +0,0 @@
-* Thu Feb 16 2023 Jens Petersen <petersen@redhat.com> - 0.8.0.4-5
-- refresh to cabal-rpm-2.1.0 with SPDX migration
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 17 2022 Jens Petersen <petersen@redhat.com> - 0.8.0.4-3
-- rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.8.0.4-1
-- update to 0.8.0.4
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.3-4
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.8.0.3-2
-- refresh to cabal-rpm-2.0.6
-
-* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 0.8.0.3-1
-- update to 0.8.0.3
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.8.0.1-1
-- update to 0.8.0.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Feb 21 2019 Jens Petersen <petersen@redhat.com> - 0.7.0.4-1
-- update to 0.7.0.4
-
-* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.7.0.1-7
-- refresh to cabal-rpm-0.13
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.7.0.1-5
-- revise .cabal
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.7.0.1-2
-- rebuild
-
-* Tue Jul 25 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.7.0.1-1
-- spec file generated by cabal-rpm-0.11.1

ghc-vector-algorithms.spec

@@ -1,5 +1,5 @@
-# generated by cabal-rpm-2.1.0
+# generated by cabal-rpm-0.12.5
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
+# https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name vector-algorithms
 %global pkgver %{pkg_name}-%{version}
@@ -7,31 +7,21 @@
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
-Version:        0.8.0.4
+Version:        0.7.0.1
-Release:        %autorelease
+Release:        5%{?dist}
 Summary:        Efficient algorithms for vector arrays
 
-License:        BSD-3-Clause
+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:
-BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  ghc-base-devel
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-primitive-devel
 BuildRequires:  ghc-vector-devel
-%if %{with ghc_prof}
-BuildRequires:  ghc-base-prof
-BuildRequires:  ghc-bytestring-prof
-BuildRequires:  ghc-primitive-prof
-BuildRequires:  ghc-vector-prof
-%endif
 %if %{with tests}
 BuildRequires:  ghc-QuickCheck-devel
 BuildRequires:  ghc-containers-devel
@@ -39,16 +29,17 @@ BuildRequires:  ghc-containers-devel
 # End cabal-rpm deps
 
 %description
-Efficient algorithms for sorting vector arrays. At some stage other vector
+Efficient algorithms for vector arrays.
-algorithms may be added.
 
 
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
-Provides:       %{name}-static%{?_isa} = %{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}
 
@@ -57,73 +48,50 @@ This package provides the Haskell %{pkg_name} library development
 files.
 
 
-%if %{with haddock}
-%package doc
-Summary:        Haskell %{pkg_name} library documentation
-BuildArch:      noarch
-Requires:       ghc-filesystem
-
-%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}
-Supplements:    (%{name}-devel and ghc-prof)
-
-%description prof
-This package provides the Haskell %{pkg_name} profiling library.
-%endif
-
-
 %prep
-# Begin cabal-rpm setup:
 %setup -q -n %{pkgver}
-dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
+cp -p %{SOURCE1} %{pkg_name}.cabal
-# 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
-%if %{with tests}
 %cabal_test
-%endif
+
+
+%post devel
+%ghc_pkg_recache
+
+
+%postun devel
+%ghc_pkg_recache
 
 
 %files -f %{name}.files
-# Begin cabal-rpm files:
 %license LICENSE
-# End cabal-rpm files
 
 
 %files devel -f %{name}-devel.files
-%doc CHANGELOG.md
-
-
-%if %{with haddock}
-%files doc -f %{name}-doc.files
-%license LICENSE
-%endif
-
-
-%if %{with ghc_prof}
-%files prof -f %{name}-prof.files
-%endif
 
 
 %changelog
-%autochangelog
+* Sat Jul 28 2018 Jens Petersen <petersen@redhat.com> - 0.7.0.1-5
+- revise .cabal
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.7.0.1-2
+- rebuild
+
+* Tue Jul 25 2017 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.7.0.1-1
+- spec file generated by cabal-rpm-0.11.1

sources

@@ -1 +1 @@
-SHA512 (vector-algorithms-0.8.0.4.tar.gz) = da5f52493c7f68df0a2c718724dcac9be758b09b14c8fa913aa328ee4c1286893fb239882018202d0fcd56709364ccddf3d620ff3b886d830102ef52a0868d42
+SHA512 (vector-algorithms-0.7.0.1.tar.gz) = 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a

vector-algorithms-0.7.0.1.cabal

@@ -1,22 +1,18 @@
 name:              vector-algorithms
-version:           0.8.0.4
+version:           0.7.0.1
-x-revision: 2
+x-revision: 1
 license:           BSD3
 license-file:      LICENSE
 author:            Dan Doel
 maintainer:        Dan Doel <dan.doel@gmail.com>
-                   Erik de Castro Lopo <erikd@mega-nerd.com>
 copyright:         (c) 2008,2009,2010,2011,2012,2013,2014,2015 Dan Doel
                    (c) 2015 Tim Baumann
-homepage:          https://github.com/erikd/vector-algorithms/
+homepage:          http://code.haskell.org/~dolio/
 category:          Data
 synopsis:          Efficient algorithms for vector arrays
-description:       Efficient algorithms for sorting vector arrays. At some stage
+description:       Efficient algorithms for vector arrays
-                   other vector algorithms may be added.
 build-type:        Simple
-cabal-version:     >= 1.10
+cabal-version:     >= 1.9.2
-extra-source-files: CHANGELOG.md
-
 
 flag BoundsChecks
   description: Enable bounds checking
@@ -35,36 +31,24 @@ flag InternalChecks
 flag bench
   description: Build a benchmarking program to test vector-algorithms
                performance
-  default: True
+  default: False
 
 flag properties
   description: Enable the quickcheck tests
   default: True
 
--- flag dump-simpl
---   description: Dumps the simplified core during compilation
---   default: False
-
-flag llvm
-  description: Build using llvm
-  default: False
-
 source-repository head
-  type:     git
+  type:     darcs
-  location: https://github.com/erikd/vector-algorithms/
+  location: http://hub.darcs.net/dolio/vector-algorithms
 
 library
   hs-source-dirs: src
-  default-language: Haskell2010
 
   build-depends: base >= 4.5 && < 5,
                  vector >= 0.6 && < 0.13,
-                 primitive >=0.3 && <0.8,
+                 primitive >=0.3 && <0.7,
                  bytestring >= 0.9 && < 1.0
 
-  if ! impl (ghc >= 7.8)
-    build-depends: tagged >= 0.4 && < 0.9
-
   exposed-modules:
     Data.Vector.Algorithms.Optimal
     Data.Vector.Algorithms.Insertion
@@ -80,15 +64,9 @@ library
     Data.Vector.Algorithms.Common
 
   ghc-options:
+    -Odph
     -funbox-strict-fields
 
-  -- Cabal/Hackage complains about these
-  -- if flag(dump-simpl)
-  --   ghc-options: -ddump-simpl -ddump-to-file
-
-  if flag(llvm)
-    ghc-options: -fllvm
-
   include-dirs:
     include
 
@@ -104,10 +82,8 @@ library
   if flag(InternalChecks)
     cpp-options: -DVECTOR_INTERNAL_CHECKS
 
-benchmark simple-bench
+executable vector-algorithms-bench
-  hs-source-dirs: bench/simple
+  hs-source-dirs: bench
-  type: exitcode-stdio-1.0
-  default-language: Haskell2010
 
   if !flag(bench)
     buildable: False
@@ -117,21 +93,13 @@ benchmark simple-bench
   other-modules:
     Blocks
 
-  build-depends: base, mwc-random, vector, vector-algorithms
+  build-depends: base, mwc-random, vector, vector-algorithms, mtl
-  ghc-options: -Wall
+  ghc-options: -Wall -Odph
-
-  -- Cabal/Hackage complains about these
-  -- if flag(dump-simpl)
-  --   ghc-options: -ddump-simpl -ddump-to-file
-
-  if flag(llvm)
-    ghc-options: -fllvm
 
 test-suite properties
   hs-source-dirs: tests/properties
   type: exitcode-stdio-1.0
   main-is: Tests.hs
-  default-language: Haskell2010
 
   other-modules:
     Optimal
@@ -145,10 +113,6 @@ test-suite properties
       base,
       bytestring,
       containers,
-      QuickCheck > 2.9 && < 2.15,
+      QuickCheck >= 2,
       vector,
       vector-algorithms
-
-  if flag(llvm)
-    ghc-options: -fllvm
-