From 1b7153ad28540445df57564d7833c0853c060bc656b8c092c5f004b6a67cfff0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:02:51 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-Glob revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=58 --- Glob-0.10.0.tar.gz | 3 ++ Glob-0.10.1.tar.gz | 3 -- Glob.cabal | 94 ++++++++++++++++++++++++++++++++++++++++++++++ ghc-Glob.changes | 19 ---------- ghc-Glob.spec | 8 ++-- 5 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 Glob-0.10.0.tar.gz delete mode 100644 Glob-0.10.1.tar.gz create mode 100644 Glob.cabal diff --git a/Glob-0.10.0.tar.gz b/Glob-0.10.0.tar.gz new file mode 100644 index 0000000..6d1d163 --- /dev/null +++ b/Glob-0.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 +size 29500 diff --git a/Glob-0.10.1.tar.gz b/Glob-0.10.1.tar.gz deleted file mode 100644 index a5668f4..0000000 --- a/Glob-0.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cae4476d944947010705e0b00cf3e36c90ef407f968861f6771b931056b6d315 -size 29763 diff --git a/Glob.cabal b/Glob.cabal new file mode 100644 index 0000000..ac8d6fd --- /dev/null +++ b/Glob.cabal @@ -0,0 +1,94 @@ +Cabal-Version: >= 1.9.2 + +Name: Glob +Version: 0.10.0 +x-revision: 1 +Homepage: http://iki.fi/matti.niemenmaa/glob/ +Synopsis: Globbing library +Category: System +Stability: provisional +Description: + A library for globbing: matching patterns against file paths. + +Author: Matti Niemenmaa +Maintainer: Matti Niemenmaa +License: BSD3 +License-File: LICENSE.txt + +Build-Type: Simple + +Extra-Source-Files: CHANGELOG.txt + CREDITS.txt + README.txt + +Source-Repository head + Type: git + Location: https://github.com/Deewiant/glob + +Library + Build-Depends: base >= 4 && < 5 + , containers < 0.7 + , directory < 1.4 + , dlist >= 0.4 && < 0.9 + , filepath >= 1.1 && < 1.5 + , transformers >= 0.2 && < 0.6 + , transformers-compat >= 0.3 && < 0.7 + + if impl(ghc < 8.0) + Build-Depends: semigroups >= 0.18 && < 0.20 + + if os(windows) + Build-Depends: Win32 == 2.* + + Exposed-Modules: System.FilePath.Glob + System.FilePath.Glob.Primitive + Other-Modules: System.FilePath.Glob.Base + System.FilePath.Glob.Directory + System.FilePath.Glob.Match + System.FilePath.Glob.Simplify + System.FilePath.Glob.Utils + + GHC-Options: -Wall + +Test-Suite glob-tests + type: exitcode-stdio-1.0 + + hs-source-dirs: ., tests + main-is: Main.hs + + Build-Depends: base >= 4 && < 5 + , containers < 0.7 + , directory < 1.4 + , dlist >= 0.4 && < 0.9 + , filepath >= 1.1 && < 1.5 + , transformers >= 0.2 && < 0.6 + , transformers-compat >= 0.3 && < 0.7 + , HUnit >= 1.2 && < 1.7 + , QuickCheck >= 2 && < 3 + , test-framework >= 0.2 && < 1 + , test-framework-hunit >= 0.2 && < 1 + , test-framework-quickcheck2 >= 0.3 && < 1 + + if impl(ghc < 8.0) + Build-Depends: semigroups >= 0.18 && < 0.20 + + if os(windows) + Build-Depends: Win32 == 2.* + + Other-Modules: System.FilePath.Glob.Base + System.FilePath.Glob.Directory + System.FilePath.Glob.Match + System.FilePath.Glob.Primitive + System.FilePath.Glob.Simplify + System.FilePath.Glob.Utils + Tests.Base + Tests.Compiler + Tests.Directory + Tests.Instances + Tests.Matcher + Tests.Optimizer + Tests.Regression + Tests.Simplifier + Tests.Utils + + GHC-Options: -Wall diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 3ca8442..7a8b24c 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.changes @@ -1,22 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:43:46 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Mon Jul 20 02:00:58 UTC 2020 - psimons@suse.com - -- Update Glob to version 0.10.1. - 0.10.1, 2020-07-19: - Updated code and dependencies to support dlist-1.0. - - Cabal-Version minimum bumped to 1.10 as Hackage now rejects older minima. - -------------------------------------------------------------------- -Tue Jun 16 11:13:35 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:13:48 UTC 2019 - Peter Simons diff --git a/ghc-Glob.spec b/ghc-Glob.spec index 6d2a5a3..da01026 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-Glob # -# 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 Glob %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.1 +Version: 0.10.0 Release: 0 Summary: Globbing library 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel @@ -55,7 +56,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 chmod -x *.txt # https://github.com/Deewiant/glob/issues/31 %build From 8e2b381a7c647b674183e18bf5bcc60148a105eff2f7856c46efe17b9211760c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:09:50 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=60 --- Glob-0.10.0.tar.gz | 3 -- Glob-0.10.1.tar.gz | 3 ++ Glob.cabal | 94 ---------------------------------------------- ghc-Glob.changes | 19 ++++++++++ ghc-Glob.spec | 8 ++-- 5 files changed, 25 insertions(+), 102 deletions(-) delete mode 100644 Glob-0.10.0.tar.gz create mode 100644 Glob-0.10.1.tar.gz delete mode 100644 Glob.cabal diff --git a/Glob-0.10.0.tar.gz b/Glob-0.10.0.tar.gz deleted file mode 100644 index 6d1d163..0000000 --- a/Glob-0.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:473355bd6ba0a97902e0edada1acbc0d76cfda77596f0188b2cc0ae34272a324 -size 29500 diff --git a/Glob-0.10.1.tar.gz b/Glob-0.10.1.tar.gz new file mode 100644 index 0000000..a5668f4 --- /dev/null +++ b/Glob-0.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cae4476d944947010705e0b00cf3e36c90ef407f968861f6771b931056b6d315 +size 29763 diff --git a/Glob.cabal b/Glob.cabal deleted file mode 100644 index ac8d6fd..0000000 --- a/Glob.cabal +++ /dev/null @@ -1,94 +0,0 @@ -Cabal-Version: >= 1.9.2 - -Name: Glob -Version: 0.10.0 -x-revision: 1 -Homepage: http://iki.fi/matti.niemenmaa/glob/ -Synopsis: Globbing library -Category: System -Stability: provisional -Description: - A library for globbing: matching patterns against file paths. - -Author: Matti Niemenmaa -Maintainer: Matti Niemenmaa -License: BSD3 -License-File: LICENSE.txt - -Build-Type: Simple - -Extra-Source-Files: CHANGELOG.txt - CREDITS.txt - README.txt - -Source-Repository head - Type: git - Location: https://github.com/Deewiant/glob - -Library - Build-Depends: base >= 4 && < 5 - , containers < 0.7 - , directory < 1.4 - , dlist >= 0.4 && < 0.9 - , filepath >= 1.1 && < 1.5 - , transformers >= 0.2 && < 0.6 - , transformers-compat >= 0.3 && < 0.7 - - if impl(ghc < 8.0) - Build-Depends: semigroups >= 0.18 && < 0.20 - - if os(windows) - Build-Depends: Win32 == 2.* - - Exposed-Modules: System.FilePath.Glob - System.FilePath.Glob.Primitive - Other-Modules: System.FilePath.Glob.Base - System.FilePath.Glob.Directory - System.FilePath.Glob.Match - System.FilePath.Glob.Simplify - System.FilePath.Glob.Utils - - GHC-Options: -Wall - -Test-Suite glob-tests - type: exitcode-stdio-1.0 - - hs-source-dirs: ., tests - main-is: Main.hs - - Build-Depends: base >= 4 && < 5 - , containers < 0.7 - , directory < 1.4 - , dlist >= 0.4 && < 0.9 - , filepath >= 1.1 && < 1.5 - , transformers >= 0.2 && < 0.6 - , transformers-compat >= 0.3 && < 0.7 - , HUnit >= 1.2 && < 1.7 - , QuickCheck >= 2 && < 3 - , test-framework >= 0.2 && < 1 - , test-framework-hunit >= 0.2 && < 1 - , test-framework-quickcheck2 >= 0.3 && < 1 - - if impl(ghc < 8.0) - Build-Depends: semigroups >= 0.18 && < 0.20 - - if os(windows) - Build-Depends: Win32 == 2.* - - Other-Modules: System.FilePath.Glob.Base - System.FilePath.Glob.Directory - System.FilePath.Glob.Match - System.FilePath.Glob.Primitive - System.FilePath.Glob.Simplify - System.FilePath.Glob.Utils - Tests.Base - Tests.Compiler - Tests.Directory - Tests.Instances - Tests.Matcher - Tests.Optimizer - Tests.Regression - Tests.Simplifier - Tests.Utils - - GHC-Options: -Wall diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 7a8b24c..3ca8442 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Aug 18 10:43:46 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Mon Jul 20 02:00:58 UTC 2020 - psimons@suse.com + +- Update Glob to version 0.10.1. + 0.10.1, 2020-07-19: + Updated code and dependencies to support dlist-1.0. + + Cabal-Version minimum bumped to 1.10 as Hackage now rejects older minima. + +------------------------------------------------------------------- +Tue Jun 16 11:13:35 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:13:48 UTC 2019 - Peter Simons diff --git a/ghc-Glob.spec b/ghc-Glob.spec index da01026..6d2a5a3 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-Glob # -# 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 Glob %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.0 +Version: 0.10.1 Release: 0 Summary: Globbing library 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel @@ -56,8 +55,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} chmod -x *.txt # https://github.com/Deewiant/glob/issues/31 %build From 70fe728dd8c8cdf20b005536dfd7f0e037a8ffaf6d5237b972a3569e347c9abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:29 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=61 --- ghc-Glob.changes | 5 +++++ ghc-Glob.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 3ca8442..3bca70c 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.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:43:46 UTC 2020 - Peter Simons diff --git a/ghc-Glob.spec b/ghc-Glob.spec index 6d2a5a3..420ac0d 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel +# 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-HUnit-devel BuildRequires: ghc-QuickCheck-devel From a409c3d575b583c504a0b4084a2d564f751c8240b3c7a664ac59d0f7709817c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:27 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=62 --- ghc-Glob.changes | 2 +- ghc-Glob.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 3bca70c..ba54010 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.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:43:46 UTC 2020 - Peter Simons diff --git a/ghc-Glob.spec b/ghc-Glob.spec index 420ac0d..0e0aea6 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel -# 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-HUnit-devel BuildRequires: ghc-QuickCheck-devel From 14f277fe8b2e31ffe8752b1bf6e4e14788ca156ccb7a8f55a4a85e6387cea93f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:27:49 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=63 --- ghc-Glob.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-Glob.changes b/ghc-Glob.changes index ba54010..c029c25 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.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