diff --git a/.gitignore b/.gitignore index 82f81cf..edbe87f 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /cabal-rpm-0.12.3.tar.gz /cabal-rpm-0.12.4.tar.gz /cabal-rpm-0.12.5.tar.gz +/cabal-rpm-0.12.6.tar.gz diff --git a/cabal-rpm-lts.patch b/cabal-rpm-lts.patch index a87a3d5..1c77017 100644 --- a/cabal-rpm-lts.patch +++ b/cabal-rpm-lts.patch @@ -1,11 +1,11 @@ ---- cabal-rpm-0.12.5/src/Options.hs~ 2018-07-29 02:11:42.000000000 +0900 -+++ cabal-rpm-0.12.5/src/Options.hs 2018-07-30 13:05:20.124019355 +0900 -@@ -74,7 +74,7 @@ - , rpmBinary = False - , rpmStrict = False - , rpmSubpackage = False -- , rpmStream = "lts" -+ , rpmStream = "lts-11" - , rpmMissing = False - , rpmRelease = Nothing - , rpmCompilerId = Nothing +--- cabal-rpm-0.12.6/src/Options.hs~ 2018-10-20 23:15:10.000000000 +0900 ++++ cabal-rpm-0.12.6/src/Options.hs 2018-10-20 23:18:38.065660148 +0900 +@@ -84,7 +84,7 @@ + } + + defaultStream :: String +-defaultStream = "lts" ++defaultStream = "lts-12" + + quiet :: RpmFlags + quiet = emptyRpmFlags {rpmVerbosity = silent} diff --git a/cabal-rpm.spec b/cabal-rpm.spec index d80a2d6..1bb7ac2 100644 --- a/cabal-rpm.spec +++ b/cabal-rpm.spec @@ -8,8 +8,8 @@ %endif Name: cabal-rpm -Version: 0.12.5 -Release: 3%{?dist} +Version: 0.12.6 +Release: 1%{?dist} Summary: RPM packaging tool for Haskell Cabal-based packages License: GPLv3+ @@ -95,6 +95,16 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm %changelog +* Sat Oct 20 2018 Jens Petersen - 0.12.6-1 +- update: remove old revised .cabal +- convert revised .cabal file to unix format (using dos2unix) +- spec: support haskell-gi libraries +- most of SysCmd moved to simple-cmd library (new dep) +- can now download multiple source files +- use line-buffering for stdout +- always do cabal update +- support ghc_without_dynamic for static executables + * Tue Sep 25 2018 Jens Petersen - 0.12.5-3 - Require dos2unix for converting .cabal files to unix text format diff --git a/sources b/sources index 844a14b..f56f12d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cabal-rpm-0.12.5.tar.gz) = 282fb3bbccc0883e39d276b12797068789f8ea4a2d629d40336983a67b4fecab4b91f358d9dcc883524d5f58a48f5c8cb201fce9ceaef62256a8403e697930ea +SHA512 (cabal-rpm-0.12.6.tar.gz) = 87b821ebbf7cb9e9c54d74b7c46555d539a9cd912acc158ee433f31c9b22f782449d3d13d65e6bf4008f6a0f97ffad9eababf80b04440c2c14df56129c502c08