diff --git a/.gitignore b/.gitignore index b25df59..ea2acb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,11 +7,7 @@ /warp-1.3.8.4.tar.gz /warp-3.0.0.5.tar.gz /warp-3.2.8.tar.gz -/psqueues-0.2.2.2.tar.gz /appar-0.1.4.tar.gz /iproute-1.7.0.tar.gz -/http2-1.6.2(1).tar.gz -/hex-0.1.2.tar.gz -/http2-1.6.2.tar.gz -/bytestring-builder-0.10.6.0.0.tar.gz /auto-update-0.1.4.tar.gz +/warp-3.0.13.1.tar.gz diff --git a/ghc-warp.spec b/ghc-warp.spec index dda7f29..027e146 100644 --- a/ghc-warp.spec +++ b/ghc-warp.spec @@ -6,20 +6,15 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=1198196 %global autoupdate auto-update-0.1.4 -%global bytestringbuilder bytestring-builder-0.10.6.0.0 -%global hex hex-0.1.2 -%global psqueues psqueues-0.2.2.2 -%global http2 http2-1.6.2 - %global appar appar-0.1.4 %global iproute iproute-1.7.0 -%global pkgstack %{autoupdate} %{bytestringbuilder} %{hex} %{psqueues} %{http2} %{appar} %{iproute} %{pkgver} +%global pkgstack %{autoupdate} %{appar} %{iproute} %{pkgver} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.2.8 +Version: 3.0.13.1 Release: 1%{?dist} Summary: A fast light-weight web server for WAI applications @@ -27,39 +22,30 @@ License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: http://hackage.haskell.org/package/%{autoupdate}/%{autoupdate}.tar.gz -Source2: http://hackage.haskell.org/package/%{bytestringbuilder}/%{bytestringbuilder}.tar.gz -Source3: http://hackage.haskell.org/package/%{hex}/%{hex}.tar.gz -Source4: http://hackage.haskell.org/package/%{psqueues}/%{psqueues}.tar.gz -Source5: http://hackage.haskell.org/package/%{http2}/%{http2}.tar.gz -Source6: http://hackage.haskell.org/package/%{appar}/%{appar}.tar.gz -Source7: http://hackage.haskell.org/package/%{iproute}/%{iproute}.tar.gz +Source2: http://hackage.haskell.org/package/%{appar}/%{appar}.tar.gz +Source3: http://hackage.haskell.org/package/%{iproute}/%{iproute}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-array-devel -BuildRequires: ghc-async-devel #BuildRequires: ghc-auto-update-devel BuildRequires: ghc-blaze-builder-devel -#BuildRequires: ghc-bytestring-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel -BuildRequires: ghc-containers-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-http-date-devel BuildRequires: ghc-http-types-devel -#BuildRequires: ghc-http2-devel #BuildRequires: ghc-iproute-devel +BuildRequires: ghc-byteorder-devel BuildRequires: ghc-network-devel BuildRequires: ghc-simple-sendfile-devel -BuildRequires: ghc-stm-devel BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-vault-devel BuildRequires: ghc-wai-devel -BuildRequires: ghc-word8-devel %if %{with tests} BuildRequires: ghc-HTTP-devel BuildRequires: ghc-HUnit-devel @@ -96,10 +82,6 @@ This package provides the Haskell %{pkg_name} library development files. %if %{defined ghclibdir} %ghc_lib_subpackage %{autoupdate} -%ghc_lib_subpackage %{bytestringbuilder} -%ghc_lib_subpackage %{hex} -%ghc_lib_subpackage %{psqueues} -%ghc_lib_subpackage %{http2} %ghc_lib_subpackage %{appar} %ghc_lib_subpackage %{iproute} %endif @@ -108,7 +90,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -c -n %{pkg_name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 +%setup -q -c -n %{pkg_name}-%{version} -a1 -a2 -a3 %build @@ -132,7 +114,7 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%license LICENSE +%license %{pkgver}/LICENSE %files devel -f %{name}-devel.files @@ -142,7 +124,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Wed Oct 05 2016 Jens Petersen - 3.2.8-1 - update to 3.2.8 -- subpackage new deps: autoupdate, bytestringbuilder, hex, psqueues, http2, +- subpackage new deps: autoupdate, hex, psqueues, http2, appar, iproute * Wed Feb 03 2016 Fedora Release Engineering - 3.0.0.5-4 diff --git a/sources b/sources index 743b37e..4d370c4 100644 --- a/sources +++ b/sources @@ -1,9 +1,4 @@ -45790539213daec9c3d04ec45db6e11a psqueues-0.2.2.2.tar.gz +052fc432fda57c8612dc9794a8b2bfff warp-3.0.13.1.tar.gz 172ce3361a53c7c0cfd1b32175962799 appar-0.1.4.tar.gz 5beae606be8b8fe0def339fb372395c0 iproute-1.7.0.tar.gz -f1d9d0a78c7e0ea50b8c2739e723506f http2-1.6.2(1).tar.gz -31e141413a2d4231af9747ad05c2ee48 hex-0.1.2.tar.gz -f1d9d0a78c7e0ea50b8c2739e723506f http2-1.6.2.tar.gz -118e9c6ff39601d4afbcfb54d80cec97 bytestring-builder-0.10.6.0.0.tar.gz ee84a6f81cc244c7cf0c76a26a7749f8 auto-update-0.1.4.tar.gz -19c70459174d6ff690290bc37d453d9f warp-3.2.8.tar.gz