diff --git a/hscolour.spec b/hscolour.spec index 2a8cd1a..d44ca57 100644 --- a/hscolour.spec +++ b/hscolour.spec @@ -1,11 +1,11 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hscolour %global pkgver %{pkg_name}-%{version} -# link statically to Haskell libs for easier ghc version bootstrapping -# (this now default but still keeping it for backcompat) +# This default now for Fedora but keeping it for backcompat +# (link statically to Haskell libs for easier ghc version bootstrapping) %global ghc_without_dynamic 1 # use following to bootstrap for a new arch: @@ -15,18 +15,21 @@ Name: %{pkg_name} Version: 1.24.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Colorize Haskell code # the source does not state intended GPL version License: LGPLv2+ Url: https://hackage.haskell.org/package/%{name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-containers-devel +Requires: %{name}-common = %{version}-%{release} # End cabal-rpm deps %description @@ -36,8 +39,17 @@ HTML 3.2 with tags, HTML 4.01 with CSS, HTML 4.01 with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX, and mIRC chat codes. +%package common +Summary: %{name} common files +BuildArch: noarch + +%description common +This package provides the %{name} common data files. + + %package -n ghc-%{name} Summary: Haskell %{name} library +Requires: %{name}-common = %{version}-%{release} %description -n ghc-%{name} This package provides the Haskell %{name} shared library. @@ -59,15 +71,22 @@ This package provides the Haskell %{name} library development files. %prep +# Begin cabal-rpm setup: %setup -q +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +mv %{buildroot}%{_ghcdocdir}{,-common} +# End cabal-rpm install %post -n ghc-%{name}-devel @@ -79,19 +98,30 @@ This package provides the Haskell %{name} library development files. %files -%license LICENCE-LGPL +# Begin cabal-rpm files: %{_bindir}/HsColour -%{_datadir}/%{name}-%{version} +# End cabal-rpm files -%files -n ghc-%{name} -f ghc-%{name}.files +%files common +# Begin cabal-rpm files: %license LICENCE-LGPL +%{_datadir}/%{pkgver} +# End cabal-rpm files + + +%files -n ghc-%{name} -f ghc-%{name}.files +# Begin cabal-rpm files: +# End cabal-rpm files %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Sun Feb 17 2019 Jens Petersen - 1.24.4-3 +- refresh to cabal-rpm-0.13 + * Fri Feb 01 2019 Fedora Release Engineering - 1.24.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild