From 8a345a5ebf2d72055a82d3f5fb1913b3c07d3a06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 23 May 2020 23:18:37 +0200 Subject: [PATCH] - up to 0.7.1.1 - remove old-locale, module doesn't exist in ghc 8.10 --- ghc-data-default.spec | 22 +++++++++------------- no-old-locale.patch | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 no-old-locale.patch diff --git a/ghc-data-default.spec b/ghc-data-default.spec index a159bf0..4f413a9 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -6,35 +6,30 @@ Summary: A class for types with a default value Summary(pl.UTF-8): Klasa dla typów z wartością domyślną Name: ghc-%{pkgname} -Version: 0.5.3 +Version: 0.7.1.1 Release: 1 License: BSD Group: Development/Languages #Source0Download: http://hackage.haskell.org/package/data-default Source0: http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz -# Source0-md5: 03a98d999273ad20d5bc0c711bf1c533 +# Source0-md5: 13ddcc28e24cd58937c7d130e885749a +Patch0: no-old-locale.patch URL: http://hackage.haskell.org/package/data-default BuildRequires: ghc >= 6.12.3 BuildRequires: ghc-data-default-class -BuildRequires: ghc-data-default-instances-base BuildRequires: ghc-data-default-instances-containers BuildRequires: ghc-data-default-instances-dlist -BuildRequires: ghc-data-default-instances-old-locale %if %{with prof} BuildRequires: ghc-prof >= 6.12.3 BuildRequires: ghc-data-default-class-prof -BuildRequires: ghc-data-default-instances-base-prof BuildRequires: ghc-data-default-instances-containers-prof BuildRequires: ghc-data-default-instances-dlist-prof -BuildRequires: ghc-data-default-instances-old-locale-prof %endif BuildRequires: rpmbuild(macros) >= 1.608 %requires_eq ghc Requires: ghc-data-default-class -Requires: ghc-data-default-instances-base Requires: ghc-data-default-instances-containers Requires: ghc-data-default-instances-dlist -Requires: ghc-data-default-instances-old-locale BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # debuginfo is not useful for ghc @@ -52,10 +47,8 @@ Summary(pl.UTF-8): Biblioteka profilująca %{pkgname} dla GHC Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: ghc-data-default-class-prof -Requires: ghc-data-default-instances-base-prof Requires: ghc-data-default-instances-containers-prof Requires: ghc-data-default-instances-dlist-prof -Requires: ghc-data-default-instances-old-locale-prof %description prof Profiling %{pkgname} library for GHC. Should be installed when @@ -78,6 +71,7 @@ Dokumentacja w formacie HTML dla pakietu ghc %{pkgname}. %prep %setup -q -n %{pkgname}-%{version} +%patch0 -p1 %build runhaskell Setup.lhs configure -v2 \ @@ -118,15 +112,17 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version} -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/HSdata-default-%{version}.o -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}-*.so +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}-*.a +%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}-*_p.a %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Default.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Default.dyn_hi %if %{with prof} %files prof %defattr(644,root,root,755) -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}_p.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSdata-default-%{version}-*_p.a %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Default.p_hi %endif diff --git a/no-old-locale.patch b/no-old-locale.patch new file mode 100644 index 0000000..f10aa1c --- /dev/null +++ b/no-old-locale.patch @@ -0,0 +1,19 @@ +diff -ur data-default-0.7.1.1/Data/Default.hs data-default-0.7.1.1-no-old-locale/Data/Default.hs +--- data-default-0.7.1.1/Data/Default.hs 2016-06-26 01:01:25.000000000 +0200 ++++ data-default-0.7.1.1-no-old-locale/Data/Default.hs 2020-05-23 23:12:05.628490399 +0200 +@@ -39,4 +39,3 @@ + import Data.Default.Class + import Data.Default.Instances.Containers () + import Data.Default.Instances.DList () +-import Data.Default.Instances.OldLocale () +diff -ur data-default-0.7.1.1/data-default.cabal data-default-0.7.1.1-no-old-locale/data-default.cabal +--- data-default-0.7.1.1/data-default.cabal 2016-06-26 01:01:25.000000000 +0200 ++++ data-default-0.7.1.1-no-old-locale/data-default.cabal 2020-05-23 23:16:20.131403789 +0200 +@@ -16,6 +16,5 @@ + Library + Build-Depends: base >=2 && <5, data-default-class >=0.1.2.0, + data-default-instances-containers, +- data-default-instances-dlist, +- data-default-instances-old-locale ++ data-default-instances-dlist + Exposed-Modules: Data.Default -- 2.44.0