From 154ade43a9e7a3710492eb4b5b429300c85983dd892fabdb5252eab5fda1d238 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 Jul 2016 13:28:49 +0000 Subject: [PATCH] Accepting request 411466 from devel:languages:haskell:lts:6 See https://lists.opensuse.org/opensuse-haskell/2016-07/msg00000.html for details. OBS-URL: https://build.opensuse.org/request/show/411466 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=18 --- ghc-conduit-extra.changes | 5 +++++ ghc-conduit-extra.spec | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index b0de73e..969d8a3 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 17 13:17:59 UTC 2016 - psimons@suse.com + +- Update to version 1.1.13.2 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sun Jul 10 15:30:34 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 0acc245..584b55f 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -17,22 +17,16 @@ %global pkg_name conduit-extra - %bcond_with tests - -Name: ghc-conduit-extra +Name: ghc-%{pkg_name} Version: 1.1.13.2 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT Group: System/Libraries - Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel @@ -47,15 +41,16 @@ BuildRequires: ghc-network-devel BuildRequires: ghc-primitive-devel BuildRequires: ghc-process-devel BuildRequires: ghc-resourcet-devel +BuildRequires: ghc-rpm-macros BuildRequires: ghc-stm-devel BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} -BuildRequires: ghc-async-devel +BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-bytestring-builder-devel -BuildRequires: ghc-exceptions-devel BuildRequires: ghc-hspec-devel %endif # End cabal-rpm deps @@ -67,33 +62,35 @@ library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit. - %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} + %build %ghc_lib_build + %install %ghc_lib_install + %check %if %{with tests} -%cabal test +%{cabal} test %endif + %post devel %ghc_pkg_recache @@ -106,5 +103,6 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files %defattr(-,root,root,-) +%doc ChangeLog.md README.md %changelog