From 6632d74682ed4ce7e241cdf05a7d9c1d12124bbb2df2de154488c178ad3a3c67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:16 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-split revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-split?expand=0&rev=60 --- ghc-split.changes | 26 -------------------- ghc-split.spec | 8 +++--- split-0.2.3.3.tar.gz | 3 +++ split-0.2.3.4.tar.gz | 3 --- split.cabal | 58 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 32 deletions(-) create mode 100644 split-0.2.3.3.tar.gz delete mode 100644 split-0.2.3.4.tar.gz create mode 100644 split.cabal diff --git a/ghc-split.changes b/ghc-split.changes index 819d4d4..f20db62 100644 --- a/ghc-split.changes +++ b/ghc-split.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:46:04 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:37 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Thu Feb 27 14:17:00 UTC 2020 - psimons@suse.com - -- Update split to version 0.2.3.4. - * 0.2.3.4 (22 February 2020) - - - Allow base-4.14 for GHC-8.10 - - * 0.2.3.3-r2 (19 August 2019) - - - Allow base-4.13 for GHC-8.8 - - * 0.2.3.3-r1 (2 August 2018) - - - Allow base-4.12 for GHC-8.6 - ------------------------------------------------------------------- Fri Nov 8 16:14:48 UTC 2019 - Peter Simons diff --git a/ghc-split.spec b/ghc-split.spec index cfa469b..60d37d3 100644 --- a/ghc-split.spec +++ b/ghc-split.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-split # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,13 @@ %global pkg_name split %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.3.4 +Version: 0.2.3.3 Release: 0 Summary: Combinator library for splitting lists License: BSD-3-Clause 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/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %if %{with tests} @@ -60,7 +61,8 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/split-0.2.3.3.tar.gz b/split-0.2.3.3.tar.gz new file mode 100644 index 0000000..13bb39f --- /dev/null +++ b/split-0.2.3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413 +size 15681 diff --git a/split-0.2.3.4.tar.gz b/split-0.2.3.4.tar.gz deleted file mode 100644 index e16fb7b..0000000 --- a/split-0.2.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:271fe5104c9f40034aa9a1aad6269bcecc9454bc5a57c247e69e17de996c1f2a -size 15942 diff --git a/split.cabal b/split.cabal new file mode 100644 index 0000000..b8076b5 --- /dev/null +++ b/split.cabal @@ -0,0 +1,58 @@ +Name: split +Version: 0.2.3.3 +x-revision: 2 +Stability: stable + +Description: A collection of various methods for splitting + lists into parts, akin to the \"split\" function + found in several mainstream languages. Here is + its tale: + . + Once upon a time the standard "Data.List" module + held no function for splitting a list into parts + according to a delimiter. Many a brave + lambda-knight strove to add such a function, but + their striving was in vain, for Lo, the Supreme + Council fell to bickering amongst themselves what + was to be the essential nature of the One True + Function which could cleave a list in twain (or + thrain, or any required number of parts). + . + And thus came to pass the split package, + comprising divers functions for splitting a list + asunder, each according to its nature. And the + Supreme Council had no longer any grounds for + argument, for the favored method of each was + contained therein. + . + To get started, see the "Data.List.Split" module. +Synopsis: Combinator library for splitting lists. +License: BSD3 +License-file: LICENSE +Copyright: (c) Brent Yorgey, Louis Wasserman 2008-2012 +Extra-source-files: README, test/Properties.hs, CHANGES +Author: Brent Yorgey +Maintainer: byorgey@gmail.com +Category: List +Build-type: Simple +Cabal-Version: >= 1.10 +Tested-with: GHC ==7.0.4, GHC ==7.2.2, GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC ==8.2.2, GHC==8.4.1 +Bug-reports: https://github.com/byorgey/split/issues + +Test-suite split-tests + type: exitcode-stdio-1.0 + main-is: Properties.hs + build-depends: base, QuickCheck >= 2.4, split + default-language: Haskell2010 + Hs-source-dirs: test + +Source-repository head + type: git + location: http://github.com/byorgey/split.git + +Library + ghc-options: -Wall + build-depends: base < 4.14 + exposed-modules: Data.List.Split, Data.List.Split.Internals + default-language: Haskell2010 + Hs-source-dirs: src From 6cc1425b7fa873aabc29a1a704520e0d157c10bb30249bc4c2257c8f83059f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:37 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-split revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-split?expand=0&rev=61 --- ghc-split.changes | 26 ++++++++++++++++++++ ghc-split.spec | 8 +++--- split-0.2.3.3.tar.gz | 3 --- split-0.2.3.4.tar.gz | 3 +++ split.cabal | 58 -------------------------------------------- 5 files changed, 32 insertions(+), 66 deletions(-) delete mode 100644 split-0.2.3.3.tar.gz create mode 100644 split-0.2.3.4.tar.gz delete mode 100644 split.cabal diff --git a/ghc-split.changes b/ghc-split.changes index f20db62..819d4d4 100644 --- a/ghc-split.changes +++ b/ghc-split.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:04 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:37 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Thu Feb 27 14:17:00 UTC 2020 - psimons@suse.com + +- Update split to version 0.2.3.4. + * 0.2.3.4 (22 February 2020) + + - Allow base-4.14 for GHC-8.10 + + * 0.2.3.3-r2 (19 August 2019) + + - Allow base-4.13 for GHC-8.8 + + * 0.2.3.3-r1 (2 August 2018) + + - Allow base-4.12 for GHC-8.6 + ------------------------------------------------------------------- Fri Nov 8 16:14:48 UTC 2019 - Peter Simons diff --git a/ghc-split.spec b/ghc-split.spec index 60d37d3..cfa469b 100644 --- a/ghc-split.spec +++ b/ghc-split.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-split # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name split %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.2.3.3 +Version: 0.2.3.4 Release: 0 Summary: Combinator library for splitting lists License: BSD-3-Clause 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/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros %if %{with tests} @@ -61,8 +60,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/split-0.2.3.3.tar.gz b/split-0.2.3.3.tar.gz deleted file mode 100644 index 13bb39f..0000000 --- a/split-0.2.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dcd674f7c5f276f33300f5fd59e49d1ac6fc92ae949fd06a0f6d3e9d9ac1413 -size 15681 diff --git a/split-0.2.3.4.tar.gz b/split-0.2.3.4.tar.gz new file mode 100644 index 0000000..e16fb7b --- /dev/null +++ b/split-0.2.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:271fe5104c9f40034aa9a1aad6269bcecc9454bc5a57c247e69e17de996c1f2a +size 15942 diff --git a/split.cabal b/split.cabal deleted file mode 100644 index b8076b5..0000000 --- a/split.cabal +++ /dev/null @@ -1,58 +0,0 @@ -Name: split -Version: 0.2.3.3 -x-revision: 2 -Stability: stable - -Description: A collection of various methods for splitting - lists into parts, akin to the \"split\" function - found in several mainstream languages. Here is - its tale: - . - Once upon a time the standard "Data.List" module - held no function for splitting a list into parts - according to a delimiter. Many a brave - lambda-knight strove to add such a function, but - their striving was in vain, for Lo, the Supreme - Council fell to bickering amongst themselves what - was to be the essential nature of the One True - Function which could cleave a list in twain (or - thrain, or any required number of parts). - . - And thus came to pass the split package, - comprising divers functions for splitting a list - asunder, each according to its nature. And the - Supreme Council had no longer any grounds for - argument, for the favored method of each was - contained therein. - . - To get started, see the "Data.List.Split" module. -Synopsis: Combinator library for splitting lists. -License: BSD3 -License-file: LICENSE -Copyright: (c) Brent Yorgey, Louis Wasserman 2008-2012 -Extra-source-files: README, test/Properties.hs, CHANGES -Author: Brent Yorgey -Maintainer: byorgey@gmail.com -Category: List -Build-type: Simple -Cabal-Version: >= 1.10 -Tested-with: GHC ==7.0.4, GHC ==7.2.2, GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC ==8.2.2, GHC==8.4.1 -Bug-reports: https://github.com/byorgey/split/issues - -Test-suite split-tests - type: exitcode-stdio-1.0 - main-is: Properties.hs - build-depends: base, QuickCheck >= 2.4, split - default-language: Haskell2010 - Hs-source-dirs: test - -Source-repository head - type: git - location: http://github.com/byorgey/split.git - -Library - ghc-options: -Wall - build-depends: base < 4.14 - exposed-modules: Data.List.Split, Data.List.Split.Internals - default-language: Haskell2010 - Hs-source-dirs: src From 9cad298a505ba24b51ce152655a80935c0d330e43c52ff649ef5d6e051259ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:59 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-split revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-split?expand=0&rev=62 --- ghc-split.changes | 5 +++++ ghc-split.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-split.changes b/ghc-split.changes index 819d4d4..80c4775 100644 --- a/ghc-split.changes +++ b/ghc-split.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:46:04 UTC 2020 - Peter Simons diff --git a/ghc-split.spec b/ghc-split.spec index cfa469b..3159226 100644 --- a/ghc-split.spec +++ b/ghc-split.spec @@ -27,6 +27,12 @@ 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 +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-QuickCheck-devel %endif From d557c2da8f8d755e39d5ad6d41e077cd17446915b1f8e41b346303d3a35ec3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:11 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-split revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-split?expand=0&rev=63 --- ghc-split.changes | 2 +- ghc-split.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-split.changes b/ghc-split.changes index 80c4775..031bd4f 100644 --- a/ghc-split.changes +++ b/ghc-split.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:46:04 UTC 2020 - Peter Simons diff --git a/ghc-split.spec b/ghc-split.spec index 3159226..ab440b6 100644 --- a/ghc-split.spec +++ b/ghc-split.spec @@ -27,12 +27,7 @@ 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 -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel %endif From 51297b44b6454d31f94642329643b439678b0d1a63ba815cee6701ce67402e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:21 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-split revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-split?expand=0&rev=64 --- ghc-split.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-split.changes b/ghc-split.changes index 031bd4f..82ff713 100644 --- a/ghc-split.changes +++ b/ghc-split.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build