From c7bb182f5e51b841b6174890cd3ffb5f75bd384d1fc26f6eee0e7c833ddb1493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 25 Aug 2016 15:54:47 +0000 Subject: [PATCH 1/3] Accepting request 422009 from devel:languages:haskell:lts:6 version and/or license update OBS-URL: https://build.opensuse.org/request/show/422009 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-edit-distance?expand=0&rev=5 --- 1.cabal | 49 +++++++++++++++++++++++++++++++++++++++ ghc-edit-distance.changes | 5 ++++ ghc-edit-distance.spec | 14 ++++------- 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 1.cabal diff --git a/1.cabal b/1.cabal new file mode 100644 index 0000000..3c2440d --- /dev/null +++ b/1.cabal @@ -0,0 +1,49 @@ +name: edit-distance +version: 0.2.2.1 +x-revision: 1 +cabal-version: >= 1.10 +category: Algorithms +synopsis: Levenshtein and restricted Damerau-Levenshtein edit distances +description: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. +license: BSD3 +license-File: LICENSE +extra-source-files: README.md +author: Max Bolingbroke +copyright: (c) 2008-2013 Maximilian Bolinbroke +maintainer: Oleg Grenrus +homepage: http://github.com/phadej/edit-distance +build-type: Simple + +library + default-language: Haskell98 + exposed-modules: Text.EditDistance + other-modules: Text.EditDistance.EditCosts + Text.EditDistance.SquareSTUArray + Text.EditDistance.STUArray + Text.EditDistance.Bits + Text.EditDistance.MonadUtilities + Text.EditDistance.ArrayUtilities + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 + ghc-options: -O2 -Wall + +test-suite edit-distance-tests + default-language: Haskell98 + main-is: Text/EditDistance/Tests.hs + other-modules: Text.EditDistance.Tests.EditOperationOntology + Text.EditDistance.Tests.Properties + type: exitcode-stdio-1.0 + ghc-options: -O2 -Wall + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1, + test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.10, test-framework-quickcheck2 + +benchmark edit-distance-benchmark + default-language: Haskell98 + main-is: Text/EditDistance/Benchmark.hs + type: exitcode-stdio-1.0 + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, + deepseq >= 1.2, unix >= 2.3, criterion >= 1.1, containers >= 0.1.0.1 + ghc-options: -O2 + +source-repository head + type: git + location: https://github.com/phadej/edit-distance.git diff --git a/ghc-edit-distance.changes b/ghc-edit-distance.changes index 99b5f79..38fb6de 100644 --- a/ghc-edit-distance.changes +++ b/ghc-edit-distance.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 17 18:28:05 UTC 2016 - psimons@suse.com + +- Update to version 0.2.2.1 revision 1 with cabal2obs. + ------------------------------------------------------------------- Sun Jul 10 17:18:49 UTC 2016 - psimons@suse.com diff --git a/ghc-edit-distance.spec b/ghc-edit-distance.spec index a7f3047..a411f2d 100644 --- a/ghc-edit-distance.spec +++ b/ghc-edit-distance.spec @@ -23,11 +23,11 @@ Version: 0.2.2.1 Release: 0 Summary: Levenshtein and restricted Damerau-Levenshtein edit distances License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-random-devel @@ -38,7 +38,6 @@ BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-quickcheck2-devel %endif -# End cabal-rpm deps %description Optimized edit distances for fuzzy matching, including Levenshtein and @@ -57,21 +56,16 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} - +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache From ca3abe51a66a9b333a1249badfe1b765506d3c2200642fa0ad15e170af95f1b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Oct 2016 08:20:43 +0000 Subject: [PATCH 2/3] Accepting request 432732 from devel:languages:haskell:lts:7 version / revision update OBS-URL: https://build.opensuse.org/request/show/432732 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-edit-distance?expand=0&rev=6 --- 1.cabal => edit-distance.cabal | 98 +++++++++++++++++----------------- ghc-edit-distance.spec | 3 +- 2 files changed, 50 insertions(+), 51 deletions(-) rename 1.cabal => edit-distance.cabal (97%) diff --git a/1.cabal b/edit-distance.cabal similarity index 97% rename from 1.cabal rename to edit-distance.cabal index 3c2440d..adcbfe1 100644 --- a/1.cabal +++ b/edit-distance.cabal @@ -1,49 +1,49 @@ -name: edit-distance -version: 0.2.2.1 -x-revision: 1 -cabal-version: >= 1.10 -category: Algorithms -synopsis: Levenshtein and restricted Damerau-Levenshtein edit distances -description: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. -license: BSD3 -license-File: LICENSE -extra-source-files: README.md -author: Max Bolingbroke -copyright: (c) 2008-2013 Maximilian Bolinbroke -maintainer: Oleg Grenrus -homepage: http://github.com/phadej/edit-distance -build-type: Simple - -library - default-language: Haskell98 - exposed-modules: Text.EditDistance - other-modules: Text.EditDistance.EditCosts - Text.EditDistance.SquareSTUArray - Text.EditDistance.STUArray - Text.EditDistance.Bits - Text.EditDistance.MonadUtilities - Text.EditDistance.ArrayUtilities - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 - ghc-options: -O2 -Wall - -test-suite edit-distance-tests - default-language: Haskell98 - main-is: Text/EditDistance/Tests.hs - other-modules: Text.EditDistance.Tests.EditOperationOntology - Text.EditDistance.Tests.Properties - type: exitcode-stdio-1.0 - ghc-options: -O2 -Wall - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1, - test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.10, test-framework-quickcheck2 - -benchmark edit-distance-benchmark - default-language: Haskell98 - main-is: Text/EditDistance/Benchmark.hs - type: exitcode-stdio-1.0 - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, - deepseq >= 1.2, unix >= 2.3, criterion >= 1.1, containers >= 0.1.0.1 - ghc-options: -O2 - -source-repository head - type: git - location: https://github.com/phadej/edit-distance.git +name: edit-distance +version: 0.2.2.1 +x-revision: 1 +cabal-version: >= 1.10 +category: Algorithms +synopsis: Levenshtein and restricted Damerau-Levenshtein edit distances +description: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. +license: BSD3 +license-File: LICENSE +extra-source-files: README.md +author: Max Bolingbroke +copyright: (c) 2008-2013 Maximilian Bolinbroke +maintainer: Oleg Grenrus +homepage: http://github.com/phadej/edit-distance +build-type: Simple + +library + default-language: Haskell98 + exposed-modules: Text.EditDistance + other-modules: Text.EditDistance.EditCosts + Text.EditDistance.SquareSTUArray + Text.EditDistance.STUArray + Text.EditDistance.Bits + Text.EditDistance.MonadUtilities + Text.EditDistance.ArrayUtilities + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 + ghc-options: -O2 -Wall + +test-suite edit-distance-tests + default-language: Haskell98 + main-is: Text/EditDistance/Tests.hs + other-modules: Text.EditDistance.Tests.EditOperationOntology + Text.EditDistance.Tests.Properties + type: exitcode-stdio-1.0 + ghc-options: -O2 -Wall + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1, + test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.10, test-framework-quickcheck2 + +benchmark edit-distance-benchmark + default-language: Haskell98 + main-is: Text/EditDistance/Benchmark.hs + type: exitcode-stdio-1.0 + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, + deepseq >= 1.2, unix >= 2.3, criterion >= 1.1, containers >= 0.1.0.1 + ghc-options: -O2 + +source-repository head + type: git + location: https://github.com/phadej/edit-distance.git diff --git a/ghc-edit-distance.spec b/ghc-edit-distance.spec index a411f2d..7bb5534 100644 --- a/ghc-edit-distance.spec +++ b/ghc-edit-distance.spec @@ -26,7 +26,7 @@ License: BSD-3-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel @@ -79,6 +79,5 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %defattr(-,root,root,-) -%doc README.md %changelog From 1a872c365948506cee8ef12543b24c2f756faea56c7794ad304ee24b313668df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Oct 2016 18:46:54 +0000 Subject: [PATCH 3/3] Use pristine copy of edited Cabal file from upstream. OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-edit-distance?expand=0&rev=7 --- edit-distance.cabal | 98 ++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/edit-distance.cabal b/edit-distance.cabal index adcbfe1..3c2440d 100644 --- a/edit-distance.cabal +++ b/edit-distance.cabal @@ -1,49 +1,49 @@ -name: edit-distance -version: 0.2.2.1 -x-revision: 1 -cabal-version: >= 1.10 -category: Algorithms -synopsis: Levenshtein and restricted Damerau-Levenshtein edit distances -description: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. -license: BSD3 -license-File: LICENSE -extra-source-files: README.md -author: Max Bolingbroke -copyright: (c) 2008-2013 Maximilian Bolinbroke -maintainer: Oleg Grenrus -homepage: http://github.com/phadej/edit-distance -build-type: Simple - -library - default-language: Haskell98 - exposed-modules: Text.EditDistance - other-modules: Text.EditDistance.EditCosts - Text.EditDistance.SquareSTUArray - Text.EditDistance.STUArray - Text.EditDistance.Bits - Text.EditDistance.MonadUtilities - Text.EditDistance.ArrayUtilities - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 - ghc-options: -O2 -Wall - -test-suite edit-distance-tests - default-language: Haskell98 - main-is: Text/EditDistance/Tests.hs - other-modules: Text.EditDistance.Tests.EditOperationOntology - Text.EditDistance.Tests.Properties - type: exitcode-stdio-1.0 - ghc-options: -O2 -Wall - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1, - test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.10, test-framework-quickcheck2 - -benchmark edit-distance-benchmark - default-language: Haskell98 - main-is: Text/EditDistance/Benchmark.hs - type: exitcode-stdio-1.0 - build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, - deepseq >= 1.2, unix >= 2.3, criterion >= 1.1, containers >= 0.1.0.1 - ghc-options: -O2 - -source-repository head - type: git - location: https://github.com/phadej/edit-distance.git +name: edit-distance +version: 0.2.2.1 +x-revision: 1 +cabal-version: >= 1.10 +category: Algorithms +synopsis: Levenshtein and restricted Damerau-Levenshtein edit distances +description: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. +license: BSD3 +license-File: LICENSE +extra-source-files: README.md +author: Max Bolingbroke +copyright: (c) 2008-2013 Maximilian Bolinbroke +maintainer: Oleg Grenrus +homepage: http://github.com/phadej/edit-distance +build-type: Simple + +library + default-language: Haskell98 + exposed-modules: Text.EditDistance + other-modules: Text.EditDistance.EditCosts + Text.EditDistance.SquareSTUArray + Text.EditDistance.STUArray + Text.EditDistance.Bits + Text.EditDistance.MonadUtilities + Text.EditDistance.ArrayUtilities + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1 + ghc-options: -O2 -Wall + +test-suite edit-distance-tests + default-language: Haskell98 + main-is: Text/EditDistance/Tests.hs + other-modules: Text.EditDistance.Tests.EditOperationOntology + Text.EditDistance.Tests.Properties + type: exitcode-stdio-1.0 + ghc-options: -O2 -Wall + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1, + test-framework >= 0.1.1, QuickCheck >= 2.4 && <2.10, test-framework-quickcheck2 + +benchmark edit-distance-benchmark + default-language: Haskell98 + main-is: Text/EditDistance/Benchmark.hs + type: exitcode-stdio-1.0 + build-depends: base >= 4.5 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0, + deepseq >= 1.2, unix >= 2.3, criterion >= 1.1, containers >= 0.1.0.1 + ghc-options: -O2 + +source-repository head + type: git + location: https://github.com/phadej/edit-distance.git