From 00056c330326b360b51f673d608485c406ad76d6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 25 Jul 2019 17:05:07 +0000
Subject: [PATCH] update to 0.11.1.0

subpackage libyaml
---
 .gitignore    |  2 ++
 ghc-yaml.spec | 48 +++++++++++++++++++++++++++++++++++++-----------
 sources       |  3 ++-
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63498dc..d8a5678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /yaml-0.8.25.1.tar.gz
 /yaml-0.8.31.1.tar.gz
 /yaml-0.8.32.tar.gz
+/yaml-0.11.1.0.tar.gz
+/libyaml-0.1.1.0.tar.gz
diff --git a/ghc-yaml.spec b/ghc-yaml.spec
index 34fa456..d2764a9 100644
--- a/ghc-yaml.spec
+++ b/ghc-yaml.spec
@@ -1,20 +1,25 @@
-# generated by cabal-rpm-1.0.0
+# generated by cabal-rpm-1.0.0 --subpackage
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name yaml
 %global pkgver %{pkg_name}-%{version}
 
+%global libyaml libyaml-0.1.1.0
+%global subpkgs %{libyaml}
+
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
-Version:        0.8.32
-Release:        6%{?dist}
+Version:        0.11.1.0
+# can only be reset when all subpkgs bumped
+Release:        1%{?dist}
 Summary:        Support for parsing and rendering YAML documents
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{libyaml}/%{libyaml}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
@@ -25,7 +30,8 @@ BuildRequires:  ghc-doc
 %if %{with ghc_prof}
 BuildRequires:  ghc-prof
 %endif
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  chrpath
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
 BuildRequires:  ghc-bytestring-devel
@@ -33,9 +39,10 @@ BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
+#BuildRequires:  ghc-libyaml-devel
+BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-scientific-devel
-BuildRequires:  ghc-semigroups-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-transformers-devel
@@ -46,10 +53,11 @@ BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-base-compat-devel
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
+BuildRequires:  ghc-raw-strings-qq-devel
 BuildRequires:  ghc-temporary-devel
 %endif
 # End cabal-rpm deps
-Provides:       bundled(libyaml) = 0.2.1
+BuildRequires:  libyaml-devel
 
 %description
 Provides support for parsing and emitting Yaml documents.
@@ -91,25 +99,39 @@ This package provides the Haskell %{pkg_name} profiling library.
 %endif
 
 
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage %{libyaml}
+%endif
+
+%global version %{main_version}
+
+
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver}
+%setup -q -n %{pkgver} -a1
 # End cabal-rpm setup
-# getting missing symbols with libyaml-0.2.1-1.fc29
-##cabal-tweak-flag system-libyaml True
-### remove the bundled lib
-##rm -r libyaml
+(
+cd %{libyaml}
+cabal-tweak-flag system-libyaml True
+# remove the bundled lib
+rm -r libyaml_src
+)
 
 
 %build
 # Begin cabal-rpm build:
+%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
+%ghc_libs_install %{subpkgs}
 %ghc_lib_install
+%ghc_fix_rpath %{pkgver}
 # End cabal-rpm install
 
 
@@ -138,6 +160,10 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 
 %changelog
+* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.11.1.0-1
+- update to 0.11.1.0
+- subpackage libyaml
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.32-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 89f9e33..e79acdd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (yaml-0.8.32.tar.gz) = 0d221441b23e4df6783ca93b9a8fb4b25ca7e472ee963206cc6967c300f4c3e17a965b57d34675f94cf31ec59c88d773569b4aa17d198e7e5edeb3343f9bebde
+SHA512 (libyaml-0.1.1.0.tar.gz) = d63e95128e12059813fdb16d8b6f432b72d057a83f229b587c9d9e8bf4de3f2777a1d2920e32ea58d8c16aa0d8e79775dec5392e19b95a36d7347994635f53e0
+SHA512 (yaml-0.11.1.0.tar.gz) = 4f166b9d7ee6aadde3f2cde2b0b5f4884d07d3a272117c2fd6aa13ab1b472aa0b07603a2a8c7e8ebb52e1d4fba8d1a03df5126b25a0b58432af3b1ed1ed3440e