StateVar is now in Fedora

ghc-contravariant.spec

@@ -4,31 +4,24 @@
 %global pkg_name contravariant
 %global pkgver %{pkg_name}-%{version}
 
-%global StateVar StateVar-1.1.0.4
-%global subpkgs %{StateVar}
-
 Name:           ghc-%{pkg_name}
 Version:        1.4
-# can only be reset when all subpkgs bumped
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contravariant functors
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{StateVar}/%{StateVar}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
-#BuildRequires:  ghc-StateVar-devel
+BuildRequires:  ghc-StateVar-devel
 BuildRequires:  ghc-semigroups-devel
 BuildRequires:  ghc-transformers-compat-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-void-devel
 # End cabal-rpm deps
-# for StateVars
-BuildRequires:  ghc-stm-devel
 
 %description
 Contravariant functors.
@@ -46,30 +39,17 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{StateVar}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-%setup -q -n %{pkgver} -a1
+%setup -q -n %{pkgver}
 
 
 %build
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 
 
 %install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 
-%ghc_fix_rpath %{subpkgs}
-
 
 %post devel
 %ghc_pkg_recache
@@ -88,6 +68,9 @@ This package provides the Haskell %{pkg_name} library development files.
 
 
 %changelog
+* Mon Oct 23 2017 Jens Petersen <petersen@redhat.com> - 1.4-4
+- StateVar is now packaged in Fedora
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild