- up to 0.94.0.0

diff --git a/ghc-8.10.patch b/ghc-8.10.patch
new file mode 100644 (file)
index 0000000..989d299
--- /dev/null
+++ b/ghc-8.10.patch
@@ -0,0 +1,11 @@
+--- regex-base-0.94.0.0/regex-base.cabal~      2001-09-09 03:46:40.000000000 +0200
++++ regex-base-0.94.0.0/regex-base.cabal       2020-05-24 16:36:55.717101489 +0200
+@@ -59,7 +59,7 @@
+     build-depends: containers >= 0.4.2.1
+                  , bytestring >= 0.9.2.1
+ 
+-  build-depends: base       >= 4.3 && < 4.14
++  build-depends: base       >= 4.3
+                , mtl        >= 1.1 && < 2.3
+                , containers >= 0.4 && < 0.7
+                , bytestring >= 0.9 && < 0.11

diff --git a/ghc-regex-base.spec b/ghc-regex-base.spec
index 7dd140a736996636dd1b6d88e4116be7b0f71c78..a13069deee8110cbaff042692b52410f60280b4f 100644 (file)
--- a/ghc-regex-base.spec
+++ b/ghc-regex-base.spec
@@ -6,13 +6,14 @@
 Summary:       Interface API for regex-posix,pcre,parsec,tdfa,dfa
 Summary(pl.UTF-8):     API interfejsu dla regex-posix,pcre,parsec,tdfa,dfa
 Name:          ghc-%{pkgname}
-Version:       0.93.2
+Version:       0.94.0.0
 Release:       1
 License:       BSD
 Group:         Development/Languages
 #Source0Download: http://hackage.haskell.org/package/regex-base
 Source0:       http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: e7b93b0b17eff8d3068ecb2f5d5f6ea3
+# Source0-md5: 91f7a3e19e419fb048b8babfecc1294b
+Patch0:                ghc-8.10.patch
 URL:           http://hackage.haskell.org/package/regex-base
 BuildRequires: ghc >= 6.12.3
 BuildRequires: ghc-array
@@ -82,6 +83,7 @@ Dokumentacja w formacie HTML dla pakietu ghc %{pkgname}.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %build
 runhaskell Setup.hs configure -v2 \
@@ -122,18 +124,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSregex-base-%{version}.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base/*.dyn_hi
 
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}_p.a
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-base-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.p_hi
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Base/*.p_hi
 
 %files doc