diff --git a/.gitignore b/.gitignore index 70545f6..48b22c9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ cabal-install-0.8.2.tar.gz /hackage-security-0.5.2.2.tar.gz /cryptohash-sha256-0.11.100.1.tar.gz /cabal-install-2.0.0.1.tar.gz +/echo-0.1.3.tar.gz diff --git a/cabal-install.spec b/cabal-install.spec index 02617b0..6ff73f0 100644 --- a/cabal-install.spec +++ b/cabal-install.spec @@ -1,20 +1,25 @@ # generated by cabal-rpm-0.12.1 # https://fedoraproject.org/wiki/Packaging:Haskell -%bcond_with tests +%global echo echo-0.1.3 +%global subpkgs %{echo} + +%bcond_without tests Name: cabal-install Version: 2.0.0.1 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: The command-line interface for Cabal and Hackage License: BSD Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Source10: cabal-install.sh +Source1: https://hackage.haskell.org/package/%{echo}/%{echo}.tar.gz +Source10: cabal-install.sh BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-HTTP-devel BuildRequires: ghc-array-devel @@ -26,7 +31,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-cryptohash-sha256-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-echo-devel +#BuildRequires: ghc-echo-devel BuildRequires: ghc-edit-distance-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hackage-security-devel @@ -68,15 +73,26 @@ software by automating the fetching, configuration, compilation and installation of Haskell libraries and programs. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{echo} +%endif + +%global version %{main_version} + + %prep -%setup -q +%setup -q -a1 %build +%ghc_libs_build %{subpkgs} %ghc_bin_build %install +%ghc_libs_install %{subpkgs} %ghc_bin_install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -102,6 +118,7 @@ install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d %changelog * Wed Jan 24 2018 Jens Petersen - 2.0.0.1-1 - update to 2.0.0.1 +- subpackage new echo dep * Sat Oct 21 2017 Jens Petersen - 1.24.0.2-6 - the bundled libraries are now packaged in Fedora diff --git a/sources b/sources index a67fa75..b0789c7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (echo-0.1.3.tar.gz) = 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f SHA512 (cabal-install-2.0.0.1.tar.gz) = 136105745e22b83a9ab906ac71ebbf4a5992b1731dd152e88eaa8dfd0d3076ddaca80bf0077c8b59c085c7d2f2fd0a3786e6e4c70a47dc924995f23758952a16