From 929157995b3f1bf6805dc715c4b583afd022200f8017829bd6d1afb5ccce1881 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Feb 2022 13:44:51 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:19, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=67 --- Glob.cabal | 48 ++++++++++++++++++++++++------------------------ ghc-Glob.changes | 6 ++++++ ghc-Glob.spec | 5 +++-- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Glob.cabal b/Glob.cabal index c6c4038..46396d4 100644 --- a/Glob.cabal +++ b/Glob.cabal @@ -2,7 +2,7 @@ Cabal-Version: >= 1.10 Name: Glob Version: 0.10.2 -x-revision: 1 +x-revision: 3 Homepage: http://iki.fi/matti.niemenmaa/glob/ Synopsis: Globbing library Category: System @@ -26,19 +26,19 @@ Source-Repository head Location: https://github.com/Deewiant/glob Library - Build-Depends: base >= 4 && < 5 - , containers < 0.7 - , directory < 1.4 - , dlist >= 0.4 && < 1.1 - , filepath >= 1.1 && < 1.5 - , transformers >= 0.2 && < 0.6 - , transformers-compat >= 0.3 && < 0.8 + Build-Depends: base >= 4 && < 5 + , containers + , directory + , dlist >= 0.4 + , filepath >= 1.1 + , transformers >= 0.2 + , transformers-compat >= 0.3 if impl(ghc < 8.0) - Build-Depends: semigroups >= 0.18 && < 0.21 + Build-Depends: semigroups >= 0.18 if os(windows) - Build-Depends: Win32 == 2.* + Build-Depends: Win32 >= 2.5 Default-Language: Haskell98 @@ -59,23 +59,23 @@ Test-Suite glob-tests main-is: Main.hs Build-Depends: base >= 4 && < 5 - , containers < 0.7 - , directory < 1.4 - , dlist >= 0.4 && < 1.1 - , filepath >= 1.1 && < 1.5 - , transformers >= 0.2 && < 0.6 - , transformers-compat >= 0.3 && < 0.8 - , 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 + , containers + , directory + , dlist >= 0.4 + , filepath >= 1.1 + , transformers >= 0.2 + , transformers-compat >= 0.3 + , HUnit >= 1.2 + , QuickCheck >= 2 + , test-framework >= 0.2 + , test-framework-hunit >= 0.2 + , test-framework-quickcheck2 >= 0.3 if impl(ghc < 8.0) - Build-Depends: semigroups >= 0.18 && < 0.20 + Build-Depends: semigroups >= 0.18 if os(windows) - Build-Depends: Win32 == 2.* + Build-Depends: Win32 >= 2 Default-Language: Haskell98 @@ -95,4 +95,4 @@ Test-Suite glob-tests Tests.Simplifier Tests.Utils - GHC-Options: -Wall + GHC-Options: -Wall \ No newline at end of file diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 475f832..fa2aefb 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:23 UTC 2022 - psimons@suse.com + +- Update Glob to version 0.10.2 revision 3. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sat Nov 20 17:31:36 UTC 2021 - psimons@suse.com diff --git a/ghc-Glob.spec b/ghc-Glob.spec index ba72fac..240f3b7 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-Glob # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ 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 +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/3.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel @@ -59,6 +59,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal +chmod -x *.txt # https://github.com/Deewiant/glob/issues/31 %build %ghc_lib_build