diff --git a/ghc-regex-posix.changes b/ghc-regex-posix.changes index 284dadd..fbab671 100644 --- a/ghc-regex-posix.changes +++ b/ghc-regex-posix.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 31 09:34:40 UTC 2020 - psimons@suse.com - -- Update regex-posix to version 0.96.0.0 revision 1. - Upstream has revised the Cabal build instructions on Hackage. - -------------------------------------------------------------------- -Tue Aug 18 10:45:52 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:32 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Thu May 7 08:08:25 UTC 2020 - Peter Simons - -- Update Cabal file to get more accurate dependency information. - ------------------------------------------------------------------- Fri Nov 8 16:14:34 UTC 2019 - Peter Simons diff --git a/ghc-regex-posix.spec b/ghc-regex-posix.spec index e554e08..b584950 100644 --- a/ghc-regex-posix.spec +++ b/ghc-regex-posix.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-regex-posix # -# 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 @@ -24,7 +24,6 @@ Summary: POSIX Backend for "Text.Regex" (regex-base) 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-array-devel BuildRequires: ghc-bytestring-devel @@ -55,8 +54,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/regex-posix.cabal b/regex-posix.cabal deleted file mode 100644 index 1a82a44..0000000 --- a/regex-posix.cabal +++ /dev/null @@ -1,79 +0,0 @@ -cabal-version: 1.12 -name: regex-posix -version: 0.96.0.0 -x-revision: 1 - -build-type: Simple -license: BSD3 -license-file: LICENSE -copyright: Copyright (c) 2007-2010, Christopher Kuklewicz -author: Christopher Kuklewicz -maintainer: hvr@gnu.org -bug-reports: https://github.com/hvr/regex-posix -synopsis: POSIX Backend for "Text.Regex" (regex-base) -category: Text -description: - The POSIX regex backend for . - . - The main appeal of this backend is that it's very lightweight due to its reliance on the ubiquitous facility that is provided by the standard C library on most POSIX platforms. - . - See also for more information. - -extra-source-files: - ChangeLog.md - cbits/myfree.h - -source-repository head - type: git - location: https://github.com/hvr/regex-posix.git - -flag _regex-posix-clib - manual: False - default: False - description: Use package - -library - hs-source-dirs: src - exposed-modules: - Text.Regex.Posix - Text.Regex.Posix.Wrap - Text.Regex.Posix.String - Text.Regex.Posix.Sequence - Text.Regex.Posix.ByteString - Text.Regex.Posix.ByteString.Lazy - - other-modules: - Paths_regex_posix - - c-sources: cbits/myfree.c - include-dirs: cbits - - if flag(_regex-posix-clib) - build-depends: regex-posix-clib == 2.7.* - else - -- use POSIX.2 regex implementation from @libc@ - -- However, Windows/msys2 doesn't provide a POSIX.2 regex impl in its @libc@ - if os(windows) - build-depends: base<0 - - default-language: Haskell2010 - default-extensions: - MultiParamTypeClasses - FunctionalDependencies - ForeignFunctionInterface - GeneralizedNewtypeDeriving - FlexibleContexts - TypeSynonymInstances - FlexibleInstances - - build-depends: regex-base == 0.94.* - , base >= 4.3 && < 4.15 - , containers >= 0.4 && < 0.7 - , bytestring >= 0.9 && < 0.11 - , array >= 0.3 && < 0.6 - - if !impl(ghc >= 8) - build-depends: fail == 4.9.* - - ghc-options: -O2 - -Wall -fno-warn-unused-imports