From f4da72329ebb18514e2ed61dee00ff44bd0b870aed754787e407bc8489c02c0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:52 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.4.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=30 --- ghc-xml-conduit.changes | 7 ++++ ghc-xml-conduit.spec | 48 +++++++++++++++++++++-- xml-conduit-1.9.1.1.tar.gz | 3 -- xml-conduit-1.9.1.2.tar.gz | 3 ++ xml-conduit.cabal | 79 -------------------------------------- 5 files changed, 54 insertions(+), 86 deletions(-) delete mode 100644 xml-conduit-1.9.1.1.tar.gz create mode 100644 xml-conduit-1.9.1.2.tar.gz delete mode 100644 xml-conduit.cabal diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 3dbf738..51bf0e6 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 22 19:25:42 UTC 2023 - Peter Simons + +- Update xml-conduit to version 1.9.1.2. + Upstream has not updated the file "ChangeLog.md" since the last + release. + ------------------------------------------------------------------- Sun Oct 30 14:50:43 UTC 2022 - Peter Simons diff --git a/ghc-xml-conduit.spec b/ghc-xml-conduit.spec index 84a2927..0d83b61 100644 --- a/ghc-xml-conduit.spec +++ b/ghc-xml-conduit.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-xml-conduit # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,36 +17,56 @@ %global pkg_name xml-conduit +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.9.1.1 +Version: 1.9.1.2 Release: 0 Summary: Pure-Haskell utilities for dealing with XML with the conduit package License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-Cabal-prof BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-blaze-html-devel +BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-blaze-markup-devel +BuildRequires: ghc-blaze-markup-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-cabal-doctest-devel +BuildRequires: ghc-cabal-doctest-prof BuildRequires: ghc-conduit-devel BuildRequires: ghc-conduit-extra-devel +BuildRequires: ghc-conduit-extra-prof +BuildRequires: ghc-conduit-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-class-devel +BuildRequires: ghc-data-default-class-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-resourcet-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof BuildRequires: ghc-xml-types-devel +BuildRequires: ghc-xml-types-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-HUnit-prof BuildRequires: ghc-doctest-devel +BuildRequires: ghc-doctest-prof BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-prof %endif %description @@ -63,9 +83,24 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -88,4 +123,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc ChangeLog.md README.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog diff --git a/xml-conduit-1.9.1.1.tar.gz b/xml-conduit-1.9.1.1.tar.gz deleted file mode 100644 index f9b0d87..0000000 --- a/xml-conduit-1.9.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdb117606c0b56ca735564465b14b50f77f84c9e52e31d966ac8d4556d3ff0ff -size 42901 diff --git a/xml-conduit-1.9.1.2.tar.gz b/xml-conduit-1.9.1.2.tar.gz new file mode 100644 index 0000000..37c8a86 --- /dev/null +++ b/xml-conduit-1.9.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:959b46fa0ba0568fdfdd213070245999244a934ca9a4ab6e30141f2d605648dd +size 44371 diff --git a/xml-conduit.cabal b/xml-conduit.cabal deleted file mode 100644 index 32a47a2..0000000 --- a/xml-conduit.cabal +++ /dev/null @@ -1,79 +0,0 @@ -cabal-version: >= 1.14 - -name: xml-conduit -version: 1.9.1.1 -x-revision: 2 -license: MIT -license-file: LICENSE -author: Michael Snoyman , Aristid Breitkreuz -maintainer: Michael Snoyman -synopsis: Pure-Haskell utilities for dealing with XML with the conduit package. -description: Hackage documentation generation is not reliable. For up to date documentation, please see: . -category: XML, Conduit -stability: Stable -build-type: Custom -homepage: http://github.com/snoyberg/xml -extra-source-files: README.md - ChangeLog.md -tested-with: GHC >=8.0 && <8.12 - -custom-setup - setup-depends: base >= 4 && <5, Cabal, cabal-doctest >= 1 && <1.1 - -library - build-depends: base >= 4 && < 5 - , conduit >= 1.3 && < 1.4 - , conduit-extra >= 1.3 && < 1.4 - , resourcet >= 1.2 && < 1.4 - , bytestring >= 0.10.2 - , text >= 0.7 - , containers >= 0.2 - , xml-types >= 0.3.4 && < 0.4 - , attoparsec >= 0.10 - , transformers >= 0.2 && < 0.7 - , data-default-class - , blaze-markup >= 0.5 - , blaze-html >= 0.5 - , deepseq >= 1.1.0.0 - exposed-modules: Text.XML.Stream.Parse - Text.XML.Stream.Render - Text.XML.Unresolved - Text.XML.Cursor - Text.XML.Cursor.Generic - Text.XML - other-modules: Text.XML.Stream.Token - ghc-options: -Wall - hs-source-dirs: src - default-language: Haskell2010 - -test-suite unit - type: exitcode-stdio-1.0 - main-is: unit.hs - hs-source-dirs: test - build-depends: base - , containers - , text - , transformers - , bytestring - , xml-conduit - , hspec >= 1.3 - , HUnit - , xml-types >= 0.3.1 - , conduit - , conduit-extra - , blaze-markup - , resourcet - default-language: Haskell2010 - -test-suite doctest - type: exitcode-stdio-1.0 - main-is: doctest.hs - hs-source-dirs: test - build-depends: base - , doctest >= 0.8 - , xml-conduit - default-language: Haskell2010 - -source-repository head - type: git - location: git://github.com/snoyberg/xml.git From 17e6e08e0723fdf4adc9b0bd674a5fb916d72c8ce60c7a39df5807a55e07de8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:39:00 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.4.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=31 --- ghc-xml-conduit.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-xml-conduit.changes b/ghc-xml-conduit.changes index 51bf0e6..0ea2643 100644 --- a/ghc-xml-conduit.changes +++ b/ghc-xml-conduit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:09:07 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Wed Mar 22 19:25:42 UTC 2023 - Peter Simons