From 9669c79bbc7d2c68d8f4923a331ca2f05e02879257c28687fcd608984b99125b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:02:58 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-aeson-pretty revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson-pretty?expand=0&rev=35 --- ghc-aeson-pretty.changes | 15 --------------- ghc-aeson-pretty.spec | 10 +++++++--- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/ghc-aeson-pretty.changes b/ghc-aeson-pretty.changes index 6e4974a..e118179 100644 --- a/ghc-aeson-pretty.changes +++ b/ghc-aeson-pretty.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:43:55 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:41 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Thu May 7 07:44:47 UTC 2020 - Peter Simons - -- Enable 'lib-only' flag to reduce the required dependencies. - ------------------------------------------------------------------- Fri Nov 8 16:13:10 UTC 2019 - Peter Simons diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 0d0545d..9fddcf5 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson-pretty # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,13 @@ Summary: JSON pretty-printing library and command-line tool License: BSD-3-Clause 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-aeson-devel +BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel @@ -60,14 +63,14 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build -%define cabal_configure_options -flib-only %ghc_lib_build %install %ghc_lib_install +%ghc_fix_rpath %{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -77,6 +80,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.markdown From 40fef6e52e5f0ad65897e3f05eaadf35f77a8dff62fdf9899b1db0076d7217ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:09:58 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-aeson-pretty revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson-pretty?expand=0&rev=37 --- ghc-aeson-pretty.changes | 15 +++++++++++++++ ghc-aeson-pretty.spec | 10 +++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ghc-aeson-pretty.changes b/ghc-aeson-pretty.changes index e118179..6e4974a 100644 --- a/ghc-aeson-pretty.changes +++ b/ghc-aeson-pretty.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 18 10:43:55 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:41 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Thu May 7 07:44:47 UTC 2020 - Peter Simons + +- Enable 'lib-only' flag to reduce the required dependencies. + ------------------------------------------------------------------- Fri Nov 8 16:13:10 UTC 2019 - Peter Simons diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 9fddcf5..0d0545d 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-aeson-pretty # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,10 @@ Summary: JSON pretty-printing library and command-line tool License: BSD-3-Clause 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-aeson-devel -BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base-compat-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel @@ -63,14 +60,14 @@ 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 +%define cabal_configure_options -flib-only %ghc_lib_build %install %ghc_lib_install -%ghc_fix_rpath %{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -80,7 +77,6 @@ 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.markdown From 3a993b3e250c5278bf1412539560e1987d25a82550fd8094b62219f18b7de8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:34 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-aeson-pretty revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson-pretty?expand=0&rev=38 --- ghc-aeson-pretty.changes | 5 +++++ ghc-aeson-pretty.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-aeson-pretty.changes b/ghc-aeson-pretty.changes index 6e4974a..543db25 100644 --- a/ghc-aeson-pretty.changes +++ b/ghc-aeson-pretty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:43:55 UTC 2020 - Peter Simons diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 0d0545d..1020413 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %description A JSON pretty-printing library compatible with aeson as well as a command-line From 4187e35389a699179fc081805c0e958cfeb2cf01c0d41ef68a0b59a4cd2c2757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:32 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-aeson-pretty revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson-pretty?expand=0&rev=39 --- ghc-aeson-pretty.changes | 2 +- ghc-aeson-pretty.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-aeson-pretty.changes b/ghc-aeson-pretty.changes index 543db25..bb38a13 100644 --- a/ghc-aeson-pretty.changes +++ b/ghc-aeson-pretty.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:43:55 UTC 2020 - Peter Simons diff --git a/ghc-aeson-pretty.spec b/ghc-aeson-pretty.spec index 1020413..7973d6f 100644 --- a/ghc-aeson-pretty.spec +++ b/ghc-aeson-pretty.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %description A JSON pretty-printing library compatible with aeson as well as a command-line From 9f933bc28ce7e60755f8a4ca393e993dda4c1465ce01f01f662e281baaefc8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:27:57 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-aeson-pretty revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-aeson-pretty?expand=0&rev=40 --- ghc-aeson-pretty.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-aeson-pretty.changes b/ghc-aeson-pretty.changes index bb38a13..84ffbed 100644 --- a/ghc-aeson-pretty.changes +++ b/ghc-aeson-pretty.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build