diff --git a/.gitignore b/.gitignore index 9b7f79d..3ab3788 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /tidal-1.7.7.tar.gz /tidal-1.7.8.tar.gz /tidal-1.7.10.tar.gz +/tidal-1.9.2.tar.gz +/tidal-link-1.0.1.tar.gz diff --git a/ghc-tidal.spec b/ghc-tidal.spec index a6763f1..fb9dcb3 100644 --- a/ghc-tidal.spec +++ b/ghc-tidal.spec @@ -1,35 +1,54 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name tidal %global pkgver %{pkg_name}-%{version} +%global tidallink tidal-link-1.0.1 +%global subpkgs %{tidallink} + # testsuite missing deps: microspec Name: ghc-%{pkg_name} -Version: 1.7.10 -Release: 2%{?dist} +Version: 1.9.2 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Pattern language for improvised music -License: GPLv3+ +License: GPL-3.0-or-later Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{tidallink}/%{tidallink}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: ghc-async-prof +BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-clock-devel +BuildRequires: ghc-colour-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-hosc-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-network-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-primitive-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-text-devel +#BuildRequires: ghc-tidal-link-devel +BuildRequires: ghc-transformers-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof -BuildRequires: ghc-bifunctors-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-clock-prof BuildRequires: ghc-colour-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-exceptions-prof -BuildRequires: ghc-hint-prof BuildRequires: ghc-hosc-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof @@ -37,7 +56,9 @@ BuildRequires: ghc-parsec-prof BuildRequires: ghc-primitive-prof BuildRequires: ghc-random-prof BuildRequires: ghc-text-prof +#BuildRequires: ghc-tidal-link-prof BuildRequires: ghc-transformers-prof +%endif # End cabal-rpm deps %description @@ -79,23 +100,36 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage -l GPL-3.0-or-later %{tidallink} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # 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 # End cabal-rpm install +echo %{_bindir}/linktest >> %{tidallink}/ghc-tidal-link-devel.files + %files -f %{name}.files # Begin cabal-rpm files: @@ -106,7 +140,6 @@ This package provides the Haskell %{pkg_name} profiling library. %files devel -f %{name}-devel.files %doc CHANGELOG.md README.md -%{_bindir}/%{pkg_name} %if %{with haddock} @@ -121,6 +154,11 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Sun Jan 22 2023 Jens Petersen - 1.9.2-1 +- https://hackage.haskell.org/package/tidal-1.9.2/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration +- new dep: tidal-link + * Thu Jul 21 2022 Fedora Release Engineering - 1.7.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 15057c3..6d79342 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (tidal-1.7.10.tar.gz) = bee0f4672ad6fee6cafbc46a34461c6ed8a325140429a5f7e839fb7737bd605255b7ee41ef36ea08a862af1362717815c48e62f7a7a07d17f3233e2ac72e5a70 +SHA512 (tidal-1.9.2.tar.gz) = 64deb1c3c9cc37623840f925c7eb3866b17e328b882a03f5b7a6fd370c4fae59fbf10a1a3c17df1bdc902235e0cb6880293c6a1de89a6ca422938ef0a4d42d69 +SHA512 (tidal-link-1.0.1.tar.gz) = 9b0e80d92aaa1496304d878293b6c9ac4cf257b1c898190135288087f38cc965f27017f80b6d073c6de2b68271436bc8deb00173d77a93099c3d9f742b57829b