From 33631cdc4f8994044d7cbbcbaad9d9ae6f6544a2bde03a407fb226519d97f5a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:25 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-hs-bibutils revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hs-bibutils?expand=0&rev=18 --- ghc-hs-bibutils.changes | 20 +------------------- ghc-hs-bibutils.spec | 6 +++--- hs-bibutils-6.10.0.0.tar.gz | 3 --- hs-bibutils-6.8.0.0.tar.gz | 3 +++ 4 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 hs-bibutils-6.10.0.0.tar.gz create mode 100644 hs-bibutils-6.8.0.0.tar.gz diff --git a/ghc-hs-bibutils.changes b/ghc-hs-bibutils.changes index 9b112a5..1f89ddd 100644 --- a/ghc-hs-bibutils.changes +++ b/ghc-hs-bibutils.changes @@ -1,23 +1,5 @@ ------------------------------------------------------------------- -Tue Aug 18 10:45:02 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:11 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Wed May 6 06:54:12 UTC 2020 - psimons@suse.com - -- Update hs-bibutils to version 6.10.0.0. - # 6.10.0.0 - - - Import Bibutils 6.10 - -------------------------------------------------------------------- -Sun Dec 29 10:27:09 UTC 2019 - psimons@suse.com +Thu Dec 26 03:02:49 UTC 2019 - psimons@suse.com - Update hs-bibutils to version 6.8.0.0. # 6.8.0.0 diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index 818fae1..77b7a4f 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hs-bibutils # -# 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 @@ -18,7 +18,7 @@ %global pkg_name hs-bibutils Name: ghc-%{pkg_name} -Version: 6.10.0.0 +Version: 6.8.0.0 Release: 0 Summary: Haskell bindings to bibutils, the bibliography conversion utilities License: GPL-2.0-or-later @@ -53,7 +53,7 @@ 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 %ghc_lib_build diff --git a/hs-bibutils-6.10.0.0.tar.gz b/hs-bibutils-6.10.0.0.tar.gz deleted file mode 100644 index 30ce4a8..0000000 --- a/hs-bibutils-6.10.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76bc12763bd8c45519313a08fad3ce715ec4b9d5373146791431ae5c76f0d7f2 -size 754344 diff --git a/hs-bibutils-6.8.0.0.tar.gz b/hs-bibutils-6.8.0.0.tar.gz new file mode 100644 index 0000000..eb71518 --- /dev/null +++ b/hs-bibutils-6.8.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cab7f3866df0fe58c6eefa3ce5207ce2c2fd6b8e763f54cd952553c0281d06b +size 751679 From cfe69f6926e1b144e565775aabd45ea86bac2bdd8b1ba8fa9bbb4a67efe4b73c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:38 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hs-bibutils revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hs-bibutils?expand=0&rev=19 --- ghc-hs-bibutils.changes | 20 +++++++++++++++++++- ghc-hs-bibutils.spec | 6 +++--- hs-bibutils-6.10.0.0.tar.gz | 3 +++ hs-bibutils-6.8.0.0.tar.gz | 3 --- 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 hs-bibutils-6.10.0.0.tar.gz delete mode 100644 hs-bibutils-6.8.0.0.tar.gz diff --git a/ghc-hs-bibutils.changes b/ghc-hs-bibutils.changes index 1f89ddd..9b112a5 100644 --- a/ghc-hs-bibutils.changes +++ b/ghc-hs-bibutils.changes @@ -1,5 +1,23 @@ ------------------------------------------------------------------- -Thu Dec 26 03:02:49 UTC 2019 - psimons@suse.com +Tue Aug 18 10:45:02 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:11 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Wed May 6 06:54:12 UTC 2020 - psimons@suse.com + +- Update hs-bibutils to version 6.10.0.0. + # 6.10.0.0 + + - Import Bibutils 6.10 + +------------------------------------------------------------------- +Sun Dec 29 10:27:09 UTC 2019 - psimons@suse.com - Update hs-bibutils to version 6.8.0.0. # 6.8.0.0 diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index 77b7a4f..818fae1 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hs-bibutils # -# 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 @@ -18,7 +18,7 @@ %global pkg_name hs-bibutils Name: ghc-%{pkg_name} -Version: 6.8.0.0 +Version: 6.10.0.0 Release: 0 Summary: Haskell bindings to bibutils, the bibliography conversion utilities License: GPL-2.0-or-later @@ -53,7 +53,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 diff --git a/hs-bibutils-6.10.0.0.tar.gz b/hs-bibutils-6.10.0.0.tar.gz new file mode 100644 index 0000000..30ce4a8 --- /dev/null +++ b/hs-bibutils-6.10.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76bc12763bd8c45519313a08fad3ce715ec4b9d5373146791431ae5c76f0d7f2 +size 754344 diff --git a/hs-bibutils-6.8.0.0.tar.gz b/hs-bibutils-6.8.0.0.tar.gz deleted file mode 100644 index eb71518..0000000 --- a/hs-bibutils-6.8.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cab7f3866df0fe58c6eefa3ce5207ce2c2fd6b8e763f54cd952553c0281d06b -size 751679 From cff3e19658f23cdac9f574f7863eb9348ffb7df798440b04e0f2a25fafdcf9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:14 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hs-bibutils revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hs-bibutils?expand=0&rev=20 --- ghc-hs-bibutils.changes | 5 +++++ ghc-hs-bibutils.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-hs-bibutils.changes b/ghc-hs-bibutils.changes index 9b112a5..9bc2122 100644 --- a/ghc-hs-bibutils.changes +++ b/ghc-hs-bibutils.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:45:02 UTC 2020 - Peter Simons diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index 818fae1..b901b08 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -27,6 +27,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-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 Haskell bindings to Chris Putnam's bibutils, a library that interconverts From 34d52f27300856ea0bfd2a3c66db28b85b75401e06156d52728c492e95e3e237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:13 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hs-bibutils revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hs-bibutils?expand=0&rev=21 --- ghc-hs-bibutils.changes | 2 +- ghc-hs-bibutils.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-hs-bibutils.changes b/ghc-hs-bibutils.changes index 9bc2122..3ac15c0 100644 --- a/ghc-hs-bibutils.changes +++ b/ghc-hs-bibutils.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:45:02 UTC 2020 - Peter Simons diff --git a/ghc-hs-bibutils.spec b/ghc-hs-bibutils.spec index b901b08..efb4664 100644 --- a/ghc-hs-bibutils.spec +++ b/ghc-hs-bibutils.spec @@ -27,12 +27,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-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 Haskell bindings to Chris Putnam's bibutils, a library that interconverts From b68281bb508f581d8a365ffd8047212b70d9d0699354b8990e0a73d269b87726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:40 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hs-bibutils revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hs-bibutils?expand=0&rev=22 --- ghc-hs-bibutils.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hs-bibutils.changes b/ghc-hs-bibutils.changes index 3ac15c0..ca70118 100644 --- a/ghc-hs-bibutils.changes +++ b/ghc-hs-bibutils.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