unsubpackage enclosed-exceptions

ghc-yaml.spec

@@ -2,33 +2,29 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name yaml
-%global pkgver %{pkg_name}-%{version}
-# https://bugzilla.redhat.com/show_bug.cgi?id=1374137
-%global subpkgver enclosed-exceptions-1.0.2
 
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
 Version:        0.8.18.7
-# only reset when both packages bumped
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Support for parsing and rendering YAML documents
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
-Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz
+Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra >= 1.6.9
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
+BuildRequires:  chrpath
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-attoparsec-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
-#BuildRequires:  ghc-enclosed-exceptions-devel
+BuildRequires:  ghc-enclosed-exceptions-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-scientific-devel
@@ -44,6 +40,7 @@ BuildRequires:  ghc-aeson-qq-devel
 BuildRequires:  ghc-base-compat-devel
 BuildRequires:  ghc-hspec-devel
 BuildRequires:  ghc-mockery-devel
+BuildRequires:  ghc-temporary-devel
 %endif
 # End cabal-rpm deps
 
@@ -71,33 +68,24 @@ Requires:       pkgconfig(yaml-0.1)
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{subpkgver}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-%setup -q -c -n %{pkgver} -a1
-cd %{pkgver}
+%setup -q -n %{pkg_name}-%{version}
 cabal-tweak-flag system-libyaml True
 # remove the bundled lib
 rm -r libyaml
 
 
 %build
-%ghc_libs_build %{subpkgver} %{pkgver}
+%ghc_lib_build
 
 
 %install
-%ghc_libs_install %{subpkgver} %{pkgver}
+%ghc_lib_install
+
+%ghc_fix_rpath %{pkg_name}-%{version}
 
 
 %check
-cd %{pkg_name}-%{version}
 %cabal_test
 
 
@@ -113,12 +101,15 @@ cd %{pkg_name}-%{version}
 
 
 %files devel -f %{name}-devel.files
-%doc %{pkgver}/ChangeLog.md %{pkgver}/README.md %{pkgver}/examples
+%doc ChangeLog.md README.md examples
 %{_bindir}/json2yaml
 %{_bindir}/yaml2json
 
 
 %changelog
+* Fri Jan  6 2017 Jens Petersen <petersen@redhat.com> - 0.8.18.7-3
+- unsubpackage enclosed-exceptions
+
 * Tue Sep 27 2016 Jens Petersen <petersen@redhat.com> - 0.8.18.7-2
 - bump