From c6eedc2e260cde649cae898a8f99fb7598724bf8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 26 May 2020 22:58:03 +0200 Subject: [PATCH] - up to 0.10.3 --- ghc-ansi-terminal.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ghc-ansi-terminal.spec b/ghc-ansi-terminal.spec index 9ae7846..3bb6697 100644 --- a/ghc-ansi-terminal.spec +++ b/ghc-ansi-terminal.spec @@ -5,30 +5,27 @@ %define pkgname ansi-terminal Summary: Simple ANSI terminal support Name: ghc-%{pkgname} -Version: 0.6.2.3 +Version: 0.10.3 Release: 1 License: BSD Group: Development/Languages #Source0Download: http://hackage.haskell.org/package/ansi-terminal Source0: http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz -# Source0-md5: 8afe9864ce4600841a83febb40a2c753 +# Source0-md5: 023154bdde151da707b345d38553b451 URL: http://hackage.haskell.org/package/ansi-terminal BuildRequires: ghc >= 6.12.3 BuildRequires: ghc-base >= 4 -BuildRequires: ghc-base < 5 -BuildRequires: ghc-unix >= 2.3.0.0 +BuildRequires: ghc-colour >= 2.1.0 %if %{with prof} BuildRequires: ghc-prof >= 6.12.3 BuildRequires: ghc-base-prof >= 4 -BuildRequires: ghc-base-prof < 5 -BuildRequires: ghc-unix-prof >= 2.3.0.0 +BuildRequires: ghc-colour-prof >= 2.1.0 %endif BuildRequires: rpmbuild(macros) >= 1.608 Requires(post,postun): /usr/bin/ghc-pkg %requires_eq ghc Requires: ghc-base >= 4 -Requires: ghc-base < 5 -Requires: ghc-unix >= 2.3.0.0 +Requires: ghc-colour >= 2.1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # debuginfo is not useful for ghc @@ -49,7 +46,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: ghc-prof >= 6.12.3 Requires: ghc-base-prof >= 4 -Requires: ghc-base-prof < 5 +Requires: ghc-colour-prof >= 2.1.0 %description prof Profiling %{pkgname} library for GHC. Should be installed when @@ -63,28 +60,28 @@ kiedy potrzebujemy systemu profilującego z GHC. %setup -q -n %{pkgname}-%{version} %build -runhaskell Setup.lhs configure -v2 \ +runhaskell Setup.hs configure -v2 \ %{?with_prof:--enable-library-profiling} \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ --docdir=%{_docdir}/%{name}-%{version} -runhaskell Setup.lhs build -runhaskell Setup.lhs haddock --executables +runhaskell Setup.hs build +runhaskell Setup.hs haddock --executables %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d -runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT +runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT # work around automatic haddock docs installation %{__rm} -rf %{name}-%{version}-doc cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -runhaskell Setup.lhs register \ +runhaskell Setup.hs register \ --gen-pkg-config=$RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf %clean @@ -101,18 +98,21 @@ 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}/HSansi-terminal-%{version}.o -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}-*.so +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}-*.a +%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}-*_p.a %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/*.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/*.dyn_hi %dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/ANSI %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/ANSI/*.hi +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/ANSI/*.dyn_hi %if %{with prof} %files prof %defattr(644,root,root,755) -%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}_p.a +%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/libHSansi-terminal-%{version}-*_p.a %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/*.p_hi %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/System/Console/ANSI/*.p_hi %endif -- 2.44.0