resolv dep is now packaged

cabal-install.spec

@@ -1,31 +1,25 @@
 # generated by cabal-rpm-0.13
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
-%global resolv resolv-0.1.1.2
-%global subpkgs %{resolv}
-
 %bcond_without tests
 
 Name:           cabal-install
 Version:        2.2.0.0
-# can only be reset when all subpkgs bumped
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{resolv}/%{resolv}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}.cabal#/%{name}-%{version}.cabal
+Source1:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}.cabal#/%{name}-%{version}.cabal
 # End cabal-rpm sources
 
 Source10:       cabal-install.sh
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
-BuildRequires:  chrpath
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-async-devel
@@ -47,7 +41,7 @@ BuildRequires:  ghc-network-uri-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
-#BuildRequires:  ghc-resolv-devel
+BuildRequires:  ghc-resolv-devel
 BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-tar-devel
 BuildRequires:  ghc-time-devel
@@ -82,34 +76,22 @@ software by automating the fetching, configuration, compilation and
 installation of Haskell libraries and programs.
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{resolv}
-%endif
-
-%global version %{main_version}
-
-
 %prep
 # Begin cabal-rpm setup:
-%setup -q -a1
-cp -bp %{SOURCE2} %{name}.cabal
+%setup -q
+cp -bp %{SOURCE1} %{name}.cabal
 # End cabal-rpm setup
 
 
 %build
 # Begin cabal-rpm build:
-%ghc_libs_build %{subpkgs}
 %ghc_bin_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
-%ghc_libs_install %{subpkgs}
 %ghc_bin_install
-%ghc_fix_rpath %{name}-%{version}
 # End cabal-rpm install
 
 install -pm 644 -D -t %{buildroot}%{_datadir}/bash-completion/completions/ bash-completion/cabal
@@ -133,6 +115,9 @@ install -pm 644 -D -t %{buildroot}%{_sysconfdir}/profile.d/ %{SOURCE10}
 
 
 %changelog
+* Tue Apr  9 2019 Jens Petersen <petersen@redhat.com> - 2.2.0.0-2
+- resolv is now packaged
+
 * Thu Feb 21 2019 Jens Petersen <petersen@redhat.com> - 2.2.0.0-1
 - update to 2.2.0.0
 - subpackage resolv dep

sources

@@ -1,2 +1 @@
 SHA512 (cabal-install-2.2.0.0.tar.gz) = 1b8c31dee09332808bc727322e1e0ca6aaa8c818c5172f412a9d56e8474c93cc814cab6d0cb776a5d0bb94155c023a098872fb91329ff6377278f891f06686f2
-SHA512 (resolv-0.1.1.2.tar.gz) = 2c2f2fd85f2567e00800ea050dee9897a61e9c1f771d7ae893b63cf5375f88feaa1307537545ae330db92432057f390df5251662530f0c433164898e458a885f