diff --git a/shake.spec b/shake.spec index 10993ce..c8908fd 100644 --- a/shake.spec +++ b/shake.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name shake @@ -13,18 +13,21 @@ Name: %{pkg_name} Version: 0.16.4 # can only be reset when all subpkgs bumped -Release: 9%{?dist} +Release: 10%{?dist} Summary: Build system library, like Make, but more accurate dependencies License: BSD Url: https://hackage.haskell.org/package/%{name} +# Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{jsflot}/%{jsflot}.tar.gz Source2: https://hackage.haskell.org/package/%{jsjquery}/%{jsjquery}.tar.gz +# End cabal-rpm sources +# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra -# Begin cabal-rpm deps: +BuildRequires: chrpath BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel @@ -45,6 +48,7 @@ BuildRequires: ghc-utf8-string-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel %endif +Requires: %{name}-common = %{version}-%{release} # End cabal-rpm deps # for js-flot BuildRequires: ghc-HTTP-devel @@ -68,8 +72,17 @@ including seamless support for generated files, and dependencies on system information (e.g. compiler version). +%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. @@ -113,17 +126,25 @@ information (e.g. compiler version). %prep +# Begin cabal-rpm setup: %setup -q -a1 -a2 +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_libs_build %{subpkgs} %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} +mv %{buildroot}%{_ghcdocdir}{,-common} +# End cabal-rpm install echo "%{_datadir}/%{jsflot}/" >> %{jsflot}/ghc-js-flot.files echo "%{_datadir}/%{jsjquery}/" >> %{jsjquery}/ghc-js-jquery.files @@ -144,19 +165,31 @@ rm %{buildroot}%{_datadir}/%{pkgver}/docs/manual/* %files -%license LICENSE +# Begin cabal-rpm files: %{_bindir}/%{name} +# End cabal-rpm files + + +%files common +# Begin cabal-rpm files: +%license LICENSE +%doc CHANGES.txt README.md +%{_datadir}/%{pkgver} +# End cabal-rpm files %files -n ghc-%{name} -f ghc-%{name}.files -%license LICENSE -%{_datadir}/%{pkgver} +# Begin cabal-rpm files: +# End cabal-rpm files + %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files -%doc CHANGES.txt README.md %changelog +* Sun Feb 17 2019 Jens Petersen - 0.16.4-10 +- refresh to cabal-rpm-0.13 + * Sat Feb 02 2019 Fedora Release Engineering - 0.16.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild