From 3ac2425e591d68fb79531b60ced683e40c6d05bc3ded9535389bf03e16e05b7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:31 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-xml-conduit revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-xml-conduit?expand=0&rev=16 --- ghc-xml-conduit.changes | 21 --------------------- ghc-xml-conduit.spec | 6 +++--- xml-conduit-1.8.0.1.tar.gz | 3 +++ xml-conduit-1.9.0.0.tar.gz | 3 --- 4 files changed, 6 insertions(+), 27 deletions(-) create mode 100644 xml-conduit-1.8.0.1.tar.gz delete mode 100644 xml-conduit-1.9.0.0.tar.gz diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 6c0fabb..026f1da 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:46:43 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:54 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - -------------------------------------------------------------------- -Sun Dec 29 10:27:13 UTC 2019 - psimons@suse.com - -- Update xml-conduit to version 1.9.0.0. - ## 1.9.0 - - * Remove deprecated functions (`ignoreTag`, `ignoreAllTreesContent`, `takeAllTreesContent`) - * Rename `parseText'` into `parseText` - * `takeContent` and `ignoreContent` now cover entities - * Align behaviour of `take`* and `ignore`* functions - ------------------------------------------------------------------- Fri Nov 8 16:15:15 UTC 2019 - Peter Simons diff --git a/ghc-xml-conduit.spec b/ghc-xml-conduit.spec index a45db21..cd21878 100644 --- a/ghc-xml-conduit.spec +++ b/ghc-xml-conduit.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-xml-conduit # -# 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 @@ -19,7 +19,7 @@ %global pkg_name xml-conduit %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.9.0.0 +Version: 1.8.0.1 Release: 0 Summary: Pure-Haskell utilities for dealing with XML with the conduit package License: MIT @@ -61,7 +61,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/xml-conduit-1.8.0.1.tar.gz b/xml-conduit-1.8.0.1.tar.gz new file mode 100644 index 0000000..bdd971e --- /dev/null +++ b/xml-conduit-1.8.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:980b2f13ab8f54d8c2cbf92d186d5fac6c6ead42197c6687bd81e2fea2afef9c +size 39586 diff --git a/xml-conduit-1.9.0.0.tar.gz b/xml-conduit-1.9.0.0.tar.gz deleted file mode 100644 index 17d0af0..0000000 --- a/xml-conduit-1.9.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb4b8c3571dc044d0001e35f2c3e3a28f591bb6bb4a5ef7ee59207444d8a7dc -size 40139 From 90963dc7054e1cdcc50517f09f505b53d8db2885c6392cc332f07f6d64f21763 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:12:01 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-xml-conduit revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-xml-conduit?expand=0&rev=17 --- ghc-xml-conduit.changes | 21 +++++++++++++++++++++ ghc-xml-conduit.spec | 6 +++--- xml-conduit-1.8.0.1.tar.gz | 3 --- xml-conduit-1.9.0.0.tar.gz | 3 +++ 4 files changed, 27 insertions(+), 6 deletions(-) delete mode 100644 xml-conduit-1.8.0.1.tar.gz create mode 100644 xml-conduit-1.9.0.0.tar.gz diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 026f1da..6c0fabb 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:43 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:54 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +------------------------------------------------------------------- +Sun Dec 29 10:27:13 UTC 2019 - psimons@suse.com + +- Update xml-conduit to version 1.9.0.0. + ## 1.9.0 + + * Remove deprecated functions (`ignoreTag`, `ignoreAllTreesContent`, `takeAllTreesContent`) + * Rename `parseText'` into `parseText` + * `takeContent` and `ignoreContent` now cover entities + * Align behaviour of `take`* and `ignore`* functions + ------------------------------------------------------------------- Fri Nov 8 16:15:15 UTC 2019 - Peter Simons diff --git a/ghc-xml-conduit.spec b/ghc-xml-conduit.spec index cd21878..a45db21 100644 --- a/ghc-xml-conduit.spec +++ b/ghc-xml-conduit.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-xml-conduit # -# 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 @@ -19,7 +19,7 @@ %global pkg_name xml-conduit %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.8.0.1 +Version: 1.9.0.0 Release: 0 Summary: Pure-Haskell utilities for dealing with XML with the conduit package License: MIT @@ -61,7 +61,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/xml-conduit-1.8.0.1.tar.gz b/xml-conduit-1.8.0.1.tar.gz deleted file mode 100644 index bdd971e..0000000 --- a/xml-conduit-1.8.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:980b2f13ab8f54d8c2cbf92d186d5fac6c6ead42197c6687bd81e2fea2afef9c -size 39586 diff --git a/xml-conduit-1.9.0.0.tar.gz b/xml-conduit-1.9.0.0.tar.gz new file mode 100644 index 0000000..17d0af0 --- /dev/null +++ b/xml-conduit-1.9.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cb4b8c3571dc044d0001e35f2c3e3a28f591bb6bb4a5ef7ee59207444d8a7dc +size 40139 From 3efb81c2d9a2a37e1ab3bc71cfc4870e564c0d1532eedc1e7a61b3bc7d6bc6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:20 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-xml-conduit revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-xml-conduit?expand=0&rev=18 --- ghc-xml-conduit.changes | 5 +++++ ghc-xml-conduit.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 6c0fabb..1fbaf72 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.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:46:43 UTC 2020 - Peter Simons diff --git a/ghc-xml-conduit.spec b/ghc-xml-conduit.spec index a45db21..d9932f8 100644 --- a/ghc-xml-conduit.spec +++ b/ghc-xml-conduit.spec @@ -40,6 +40,12 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-xml-types-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 %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-doctest-devel From e5a6c34c31bc34959bdba98ea6ad411d29b0271185926bd105bd14ce09179c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:35 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-xml-conduit revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-xml-conduit?expand=0&rev=19 --- ghc-xml-conduit.changes | 2 +- ghc-xml-conduit.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 1fbaf72..6c9f140 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.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:46:43 UTC 2020 - Peter Simons diff --git a/ghc-xml-conduit.spec b/ghc-xml-conduit.spec index d9932f8..58fe352 100644 --- a/ghc-xml-conduit.spec +++ b/ghc-xml-conduit.spec @@ -40,12 +40,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-xml-types-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} %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-doctest-devel From 7db4a768d54e61dec53c39d2a43c2a5a2f1971004834ea55b40bf0937e1a20f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:43 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-xml-conduit revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-xml-conduit?expand=0&rev=20 --- ghc-xml-conduit.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 6c9f140..634b24b 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.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