diff --git a/.gitignore b/.gitignore index 44a0b56..05b3c34 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /singleton-bool-0.1.5.tar.gz +/singleton-bool-0.1.6.tar.gz +/some-1.0.4.1.tar.gz diff --git a/ghc-singleton-bool.spec b/ghc-singleton-bool.spec index aa1efd6..cd0e1bc 100644 --- a/ghc-singleton-bool.spec +++ b/ghc-singleton-bool.spec @@ -1,26 +1,41 @@ -# 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 singleton-bool %global pkgver %{pkg_name}-%{version} +%global some some-1.0.4.1 +%global subpkgs %{some} + Name: ghc-%{pkg_name} -Version: 0.1.5 -Release: 12%{?dist} +Version: 0.1.6 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Type level booleans -License: BSD +License: BSD-3-Clause 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{some}/%{some}.tar.gz +Source2: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +BuildRequires: ghc-boring-devel +BuildRequires: ghc-dec-devel +BuildRequires: ghc-deepseq-devel +#BuildRequires: ghc-some-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof +BuildRequires: ghc-boring-prof BuildRequires: ghc-dec-prof +BuildRequires: ghc-deepseq-prof +#BuildRequires: ghc-some-prof +%endif # End cabal-rpm deps %description @@ -65,21 +80,32 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage -l BSD-3-Clause %{some} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 +cp -bp %{SOURCE2} %{pkg_name}.cabal # 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 @@ -91,7 +117,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files -%doc CHANGELOG.md README.md +%doc CHANGELOG.md %if %{with haddock} @@ -106,6 +132,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 0.1.6-1 +- https://hackage.haskell.org/package/singleton-bool-0.1.6/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.1.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/singleton-bool-0.1.5.cabal b/singleton-bool-0.1.5.cabal deleted file mode 100644 index 4828d21..0000000 --- a/singleton-bool-0.1.5.cabal +++ /dev/null @@ -1,52 +0,0 @@ -cabal-version: >=1.10 -name: singleton-bool -version: 0.1.5 -x-revision: 3 -synopsis: Type level booleans -description: - Type level booleans. - . - @singletons@ package provides similar functionality, - but it has tight dependency constraints. - -category: Web -homepage: https://github.com/phadej/singleton-bool#readme -bug-reports: https://github.com/phadej/singleton-bool/issues -author: Oleg Grenrus -maintainer: Oleg Grenrus -license: BSD3 -license-file: LICENSE -build-type: Simple -tested-with: - GHC ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 - || ==8.8.4 - || ==8.10.4 - || ==9.0.1 - -extra-source-files: - CHANGELOG.md - README.md - -source-repository head - type: git - location: https://github.com/phadej/singleton-bool - -library - hs-source-dirs: src - ghc-options: -Wall - build-depends: base >=4.6 && <4.16 - - if impl(ghc >=7.8) - build-depends: dec >=0.0.3 && <0.1 - - exposed-modules: Data.Singletons.Bool - default-language: Haskell2010 - - if !impl(ghc >=7.8) - build-depends: tagged >=0.8.5 && <0.9 diff --git a/singleton-bool-0.1.6.cabal b/singleton-bool-0.1.6.cabal new file mode 100644 index 0000000..864dd98 --- /dev/null +++ b/singleton-bool-0.1.6.cabal @@ -0,0 +1,49 @@ +cabal-version: >=1.10 +name: singleton-bool +version: 0.1.6 +x-revision: 2 +synopsis: Type level booleans +description: + Type level booleans. + . + @singletons@ package provides similar functionality, + but it has tight dependency constraints. + +category: Web +homepage: https://github.com/phadej/singleton-bool#readme +bug-reports: https://github.com/phadej/singleton-bool/issues +author: Oleg Grenrus +maintainer: Oleg Grenrus +license: BSD3 +license-file: LICENSE +build-type: Simple +extra-source-files: CHANGELOG.md +tested-with: + GHC ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.4 + || ==8.10.4 + || ==9.0.2 + || ==9.2.4 + || ==9.4.1 + +source-repository head + type: git + location: https://github.com/phadej/singleton-bool + +library + hs-source-dirs: src + ghc-options: -Wall + build-depends: + base >=4.7 && <4.18 + , boring >=0.2 && <0.3 + , dec >=0.0.3 && <0.1 + , deepseq >=1.3 && <1.5 + , some >=1.0.3 && <1.1 + + exposed-modules: Data.Singletons.Bool + default-language: Haskell2010 diff --git a/sources b/sources index eb5f8e4..8200405 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (singleton-bool-0.1.5.tar.gz) = a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a +SHA512 (singleton-bool-0.1.6.tar.gz) = 7f14909f672aa18e0c2064fb735f894a01d5a450e6fc7a6ac28fa5cc7dd1fb2ea1a5a58a0654a98d79aae49a4c537ace5d5f6eb30e68fe0e69e0992e7e510b86 +SHA512 (some-1.0.4.1.tar.gz) = 0a590b71194b318f8b14ec41589f3d066a913c37fd2b7772991cc58b3ad94173c50d1fd8e4a6ab5a4a50f0e4d173b574ef4de127c277053bd58bcfe6b7c2fd3f