commit 12e5908e6d737f603afd1868932761deb2f3182b
Author: Jan Rękorajski <[email protected]>
Date: Sun May 24 14:08:56 2020 +0200
- up to 1.0.0.9
ghc-8.10.patch | 11 +++++++++++
ghc-setlocale.spec | 9 ++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/ghc-setlocale.spec b/ghc-setlocale.spec
index fe03d47..c5f672f 100644
--- a/ghc-setlocale.spec
+++ b/ghc-setlocale.spec
@@ -5,13 +5,14 @@
%define pkgname setlocale
Summary: Haskell bindings to setlocale
Name: ghc-%{pkgname}
-Version: 1.0.0.3
+Version: 1.0.0.9
Release: 1
License: BSD
Group: Development/Languages
#Source0Download: http://hackage.haskell.org/package/setlocale
Source0:
http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 348690842f5233f0e42e16bd615f777e
+# Source0-md5: 4cd39943f5fe5c278fde8bf1157a9383
+Patch0: ghc-8.10.patch
URL: http://hackage.haskell.org/package/setlocale
BuildRequires: ghc >= 6.12.3
%if %{with prof}
@@ -48,6 +49,7 @@ kiedy potrzebujemy systemu profilującego z GHC.
%prep
%setup -q -n %{pkgname}-%{version}
+%patch0 -p1
%build
runhaskell Setup.hs configure -v2 \
@@ -88,13 +90,14 @@ rm -rf $RPM_BUILD_ROOT
%doc %{name}-%{version}-doc/*
%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.o
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.so
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.a
%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Locale
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Locale/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Locale/*.dyn_hi
%if %{with prof}
%files prof
diff --git a/ghc-8.10.patch b/ghc-8.10.patch
new file mode 100644
index 0000000..301de34
--- /dev/null
+++ b/ghc-8.10.patch
@@ -0,0 +1,11 @@
+--- setlocale-1.0.0.9/setlocale.cabal~ 2019-09-21 22:35:54.000000000 +0200
++++ setlocale-1.0.0.9/setlocale.cabal 2020-05-24 14:07:34.571482404 +0200
+@@ -18,7 +18,7 @@
+ exposed-modules: System.Locale.SetLocale
+ -- other-modules:
+ other-extensions: DeriveDataTypeable, ForeignFunctionInterface
+- build-depends: base >=4.6 && <4.14
++ build-depends: base >=4.6 && <5
+ -- hs-source-dirs:
+ build-tools: hsc2hs
+ default-language: Haskell2010
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-setlocale.git/commitdiff/12e5908e6d737f603afd1868932761deb2f3182b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
