[packages/ghc-regex-posix] - up to 0.96.0.0
baggins
baggins at pld-linux.org
Mon May 25 08:44:37 CEST 2020
commit 0e50eeefe9cb1feb2bb35769db1b39c0379dc13e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon May 25 08:44:26 2020 +0200
- up to 0.96.0.0
ghc-8.10.patch | 11 +++++++++++
ghc-regex-posix.spec | 23 ++++++++++++++++-------
2 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/ghc-regex-posix.spec b/ghc-regex-posix.spec
index b80a4ef..b178432 100644
--- a/ghc-regex-posix.spec
+++ b/ghc-regex-posix.spec
@@ -6,13 +6,14 @@
Summary: Replaces/Enhances Text.Regex
Summary(pl.UTF-8): Podmiana/rozszerzenie Text.Regex
Name: ghc-%{pkgname}
-Version: 0.95.2
+Version: 0.96.0.0
Release: 1
License: BSD
Group: Development/Languages
#Source0Download: http://hackage.haskell.org/package/regex-posix
Source0: http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 1df0f9494aab110c7231f36393285c7c
+# Source0-md5: 1bd179e9b1804171f8a2797ea399c1b9
+Patch0: ghc-8.10.patch
URL: http://hackage.haskell.org/package/regex-posix
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,21 +124,28 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSregex-posix-%{version}.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{version}.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{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/Posix.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/ByteString
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/ByteString/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/ByteString/*.dyn_hi
%if %{with prof}
%files prof
%defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{version}_p.a
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSregex-posix-%{version}-*_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Regex/Posix/ByteString/*.p_hi
%endif
diff --git a/ghc-8.10.patch b/ghc-8.10.patch
new file mode 100644
index 0000000..e278ddd
--- /dev/null
+++ b/ghc-8.10.patch
@@ -0,0 +1,11 @@
+--- regex-posix-0.96.0.0/regex-posix.cabal~ 2001-09-09 03:46:40.000000000 +0200
++++ regex-posix-0.96.0.0/regex-posix.cabal 2020-05-25 08:42:51.071491183 +0200
+@@ -66,7 +66,7 @@
+ FlexibleInstances
+
+ build-depends: regex-base == 0.94.*
+- , base >= 4.3 && < 4.14
++ , base >= 4.3
+ , containers >= 0.4 && < 0.7
+ , bytestring >= 0.9 && < 0.11
+ , array >= 0.3 && < 0.6
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-regex-posix.git/commitdiff/0e50eeefe9cb1feb2bb35769db1b39c0379dc13e
More information about the pld-cvs-commit
mailing list