From 2e7d1fb8aa234a1df59ba77964dfaadf8d317065 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 14 2020 04:03:18 +0000 Subject: update to 0.0.4 --- diff --git a/.gitignore b/.gitignore index a26c6f6..ef6e373 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /string-qq-0.0.2.tar.gz +/string-qq-0.0.4.tar.gz diff --git a/ghc-string-qq.spec b/ghc-string-qq.spec index a00e7f9..a8ae73b 100644 --- a/ghc-string-qq.spec +++ b/ghc-string-qq.spec @@ -4,28 +4,33 @@ %global pkg_name string-qq %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 0.0.2 -Release: 9%{?dist} +Version: 0.0.4 +Release: 1%{?dist} Summary: QuasiQuoter for non-interpolated strings, texts and bytestrings License: Public Domain 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 # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-process-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof BuildRequires: ghc-template-haskell-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-text-devel +%endif # End cabal-rpm deps %description -QuasiQuoter for non-interpolated strings, texts and bytestrings. +QuasiQuoter for non-interpolated strings, texts and bytestrings, useful for +writing multi-line IsString literals. %package devel @@ -65,7 +70,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -81,6 +85,10 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install +%check +%cabal_test + + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -94,7 +102,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE -%{_datadir}/%{pkgver} # End cabal-rpm files @@ -113,6 +120,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Fri Feb 14 2020 Jens Petersen - 0.0.4-1 +- update to 0.0.4 + * Tue Jan 28 2020 Fedora Release Engineering - 0.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0a744f9..f637867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (string-qq-0.0.2.tar.gz) = 3394f2e129726e5f317693cf145ab91723e9b0352a04e42eeb770e6b5bfcade2c3c8da772f61425641b7c4e48e98542cf1a7544d48cd7f67e21f930236dae9ba +SHA512 (string-qq-0.0.4.tar.gz) = 1e533afccc4e246da8fb0d76aaa63560c4b936490c002e466bcc0d08aabc0e66f393f935e0f5d93284fcd12a590e7fbe12e88175ac3599183f633eec04bf22b4 diff --git a/string-qq-0.0.2.cabal b/string-qq-0.0.2.cabal deleted file mode 100644 index 304a592..0000000 --- a/string-qq-0.0.2.cabal +++ /dev/null @@ -1,31 +0,0 @@ -Name: string-qq -Version: 0.0.2 -x-revision: 1 -License: PublicDomain -License-file: LICENSE -Category: Data -Author: Audrey Tang -Copyright: Audrey Tang -Maintainer: Audrey Tang -Stability: unstable -Cabal-Version: >= 1.6 -Build-Type: Custom -Synopsis: QuasiQuoter for non-interpolated strings, texts and bytestrings. -Description: QuasiQuoter for non-interpolated strings, texts and bytestrings. -Data-Files: tests/Test.hs -Tested-With: GHC==6.10.1, GHC==7.0.2 - -Source-Repository head - type: git - location: git://github.com/audreyt/string-qq.git - -library - extensions: TemplateHaskell - build-depends: base > 3 && < 6, template-haskell >= 2 - hs-source-dirs: src - exposed-modules: Data.String.QQ - - -custom-setup - setup-depends: base < 5, Cabal, process -