From fe964f0d7697358b84b90f385a0a5300730daee1ad10dfb14ea3c2e942542aca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Aug 2020 01:02:13 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=52 --- ghc-skylighting.changes | 5 +++++ ghc-skylighting.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index 1c304b6..469ff6a 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:03 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + ------------------------------------------------------------------- Sun Jun 21 02:00:45 UTC 2020 - psimons@suse.com diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index e1d87a0..9ae92ad 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -51,7 +51,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build From 17e785976533dc66850859e64a463b22e31dc7a056d7d7fba0b07f6a674617e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Aug 2020 11:12:46 +0000 Subject: [PATCH 2/3] Accepting request 827774 from home:michel_mno:branches:devel:languages:haskell - Add _constraints with 6GB min disk space for ppc64/ppc64le OBS-URL: https://build.opensuse.org/request/show/827774 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=53 --- _constraints | 14 ++++++++++++++ ghc-skylighting.changes | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 _constraints diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..b5b0790 --- /dev/null +++ b/_constraints @@ -0,0 +1,14 @@ + + + + ppc64 + ppc64le + + + + 6 + + + + + diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index 469ff6a..d6226b7 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 19 06:52:08 UTC 2020 - Michel Normand + +- Add _constraints with 6GB min disk space for ppc64/ppc64le + ------------------------------------------------------------------- Tue Aug 18 10:46:03 UTC 2020 - Peter Simons From 7a25adfba748419de6f661538382e1d6541069e2e4cad1061d6c220addefbe89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Aug 2020 01:01:06 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=54 --- ghc-skylighting.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 9ae92ad..aca2222 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -24,12 +24,18 @@ Summary: Syntax highlighting library License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-binary-devel +BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-skylighting-core-devel +BuildRequires: ghc-text-devel %description Skylighting is a syntax highlighting library with support for over one hundred @@ -54,10 +60,12 @@ This package provides the Haskell %{pkg_name} library development files. %autosetup -n %{pkg_name}-%{version} %build +%define cabal_configure_options -fexecutable %ghc_lib_build %install %ghc_lib_install +%ghc_fix_rpath %{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -67,6 +75,7 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files %license LICENSE +%{_bindir}/%{pkg_name} %files devel -f %{name}-devel.files %doc README.md changelog.md