[packages/ghc-uniplate] - rel 2, rebuild with ghc 8.10.1

[baggins]

commit 250c5b0df4ed3afff4e312404f05765450e6b0c4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 24 17:01:59 2020 +0200

    - rel 2, rebuild with ghc 8.10.1

 ghc-8.10.patch    | 16 ++++++++++++++++
 ghc-uniplate.spec | 27 +++++++++++----------------
 2 files changed, 27 insertions(+), 16 deletions(-)
---
diff --git a/ghc-uniplate.spec b/ghc-uniplate.spec
index 699e2f9..c233abf 100644
--- a/ghc-uniplate.spec
+++ b/ghc-uniplate.spec
@@ -7,44 +7,36 @@ Summary:	Help writing simple, concise and fast generic operations
 Summary(pl.UTF-8):	Pomoc przy pisaniu prostych, zwięzłych i szybkich ogólnych operacji
 Name:		ghc-%{pkgname}
 Version:	1.6.12
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages
 #Source0Download: http://hackage.haskell.org/package/uniplate
 Source0:	http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5:	8a1914109e6707c4bab211d44c39f6c4
+Patch0:		ghc-8.10.patch
 URL:		http://hackage.haskell.org/package/uniplate
 BuildRequires:	ghc >= 6.12.3
 BuildRequires:	ghc-base >= 4.4
-BuildRequires:	ghc-base < 5
 BuildRequires:	ghc-containers
 BuildRequires:	ghc-hashable >= 1.1.2.3
-BuildRequires:	ghc-hashable < 1.3
 BuildRequires:	ghc-syb
 BuildRequires:	ghc-unordered-containers >= 0.2.1
-BuildRequires:	ghc-unordered-containers < 0.3
 %if %{with prof}
 BuildRequires:	ghc-prof >= 6.12.3
 BuildRequires:	ghc-base-prof >= 4.4
-BuildRequires:	ghc-base-prof < 5
 BuildRequires:	ghc-containers-prof
 BuildRequires:	ghc-hashable-prof >= 1.1.2.3
-BuildRequires:	ghc-hashable-prof < 1.3
 BuildRequires:	ghc-syb-prof
 BuildRequires:	ghc-unordered-containers-prof >= 0.2.1
-BuildRequires:	ghc-unordered-containers-prof < 0.3
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.608
 Requires(post,postun):	/usr/bin/ghc-pkg
 %requires_eq	ghc
 Requires:	ghc-base >= 4.4
-Requires:	ghc-base < 5
 Requires:	ghc-containers
 Requires:	ghc-hashable >= 1.1.2.3
-Requires:	ghc-hashable < 1.3
 Requires:	ghc-syb
 Requires:	ghc-unordered-containers >= 0.2.1
-Requires:	ghc-unordered-containers < 0.3
 Obsoletes:	ghc-uniplate-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,13 +62,10 @@ Summary(pl.UTF-8):	Biblioteka profilująca %{pkgname} dla GHC
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	ghc-base-prof >= 4.4
-Requires:	ghc-base-prof < 5
 Requires:	ghc-containers-prof
 Requires:	ghc-hashable-prof >= 1.1.2.3
-Requires:	ghc-hashable-prof < 1.3
 Requires:	ghc-syb-prof
 Requires:	ghc-unordered-containers-prof >= 0.2.1
-Requires:	ghc-unordered-containers-prof < 0.3
 
 %description prof
 Profiling %{pkgname} library for GHC. Should be installed when
@@ -88,6 +77,7 @@ kiedy potrzebujemy systemu profilującego z GHC.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %build
 runhaskell Setup.hs configure -v2 \
@@ -128,22 +118,27 @@ rm -rf $RPM_BUILD_ROOT
 %doc uniplate.htm %{name}-%{version}-doc/*
 %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSuniplate-%{version}.o
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}-*_p.a
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Data
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Data/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Data/*.dyn_hi
 %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Internal
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Internal/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Internal/*.dyn_hi
 
 %if %{with prof}
 %files prof
 %defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}_p.a
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSuniplate-%{version}-*_p.a
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/*.p_hi
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/*.p_hi
 %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Generics/Uniplate/Data/*.p_hi
diff --git a/ghc-8.10.patch b/ghc-8.10.patch
new file mode 100644
index 0000000..e6e613f
--- /dev/null
+++ b/ghc-8.10.patch
@@ -0,0 +1,16 @@
+--- uniplate-1.6.12/uniplate.cabal~	2013-10-26 23:15:52.000000000 +0200
++++ uniplate-1.6.12/uniplate.cabal	2020-05-24 16:59:55.727223404 +0200
+@@ -56,11 +56,11 @@
+     if flag(typeable_fingerprint)
+         build-depends:
+             base >=4.4 && <5, containers, syb,
+-            hashable >= 1.1.2.3 && < 1.3,
++            hashable >= 1.1.2.3,
+             unordered-containers >= 0.2.1 && < 0.3
+     else
+         if flag(separate_syb)
+-            build-depends: base >=4 && <4.4, containers, syb
++            build-depends: base >=4, containers, syb
+         else
+             build-depends: base >=3 && <4, containers
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghc-uniplate.git/commitdiff/250c5b0df4ed3afff4e312404f05765450e6b0c4