From 6a00c01c0ed5b0258e6b065e36efb93d12b33bf6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Aug 07 2018 13:53:27 +0000 Subject: update to 1.3.0: just a dummy library --- diff --git a/.gitignore b/.gitignore index 24b8297..29d4de1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /conduit-combinators-1.1.1.tar.gz /conduit-combinators-1.1.2.tar.gz +/conduit-combinators-1.3.0.tar.gz diff --git a/ghc-conduit-combinators.spec b/ghc-conduit-combinators.spec index 33e2b4f..ebf5ed1 100644 --- a/ghc-conduit-combinators.spec +++ b/ghc-conduit-combinators.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.1.2 -Release: 5%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Commonly used conduit functions, for both chunked and unchunked data License: MIT @@ -17,36 +17,6 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: -BuildRequires: ghc-base16-bytestring-devel -BuildRequires: ghc-base64-bytestring-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-chunked-data-devel -BuildRequires: ghc-conduit-devel -BuildRequires: ghc-conduit-extra-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-monad-control-devel -BuildRequires: ghc-mono-traversable-devel -BuildRequires: ghc-mwc-random-devel -BuildRequires: ghc-primitive-devel -BuildRequires: ghc-resourcet-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-transformers-base-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unix-compat-devel -BuildRequires: ghc-unix-devel -BuildRequires: ghc-vector-devel -BuildRequires: ghc-void-devel -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-containers-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-safe-devel -BuildRequires: ghc-silently-devel -%endif -# End cabal-rpm deps %description See docs and README at . @@ -55,25 +25,16 @@ See docs and README at . %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} %endif -Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. -%package devel-doc -Summary: Haskell %{pkg_name} library development documentation -BuildArch: noarch - -%description devel-doc -This package provides the Haskell %{pkg_name} development documentation. - %prep %setup -q -n %{pkgver} @@ -85,8 +46,6 @@ This package provides the Haskell %{pkg_name} development documentation. %install %ghc_lib_install -grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files -grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files %check @@ -105,13 +64,15 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %license LICENSE -%files devel -f %{name}-devel-nodoc.files +%files devel -f %{name}-devel.files %doc ChangeLog.md README.md -%files devel-doc -f %{name}-devel-doc.files -%doc ChangeLog.md README.md %changelog +* Sun Jul 22 2018 Jens Petersen - 1.3.0-1 +- update to 1.3.0 +- dummy package: functionality merged to conduit + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7efe212..3e74958 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conduit-combinators-1.1.2.tar.gz) = 7ece12d0af700f2fe903f044857d0ae754bd205b427dc63f2e8749b18e2fbdbd3c1727df742618ef5019abb25ffbf2dec9ba59a6c2f996e0e502eb2f7a6499ba +SHA512 (conduit-combinators-1.3.0.tar.gz) = b994c73f0a9c0d017831125f2dbde406d6ff1b51b0f37079e8292ff1747c9718c28cceba708b3451136a384504db1d1275e01ce0335cf1e726edd69d90a206b7