cabal-rpm 2.0.3 → 2.0.4

raw patch · 5 files changed

+17/−10 lines, 5 files

Files

• ChangeLog +4/−1
• README.md +6/−4
• TODO +3/−1
• cabal-rpm.cabal +3/−3
• src/PackageUtils.hs +1/−1

@@ -1,4 +1,7 @@-# 2.0.3 (2020-02-24) Fedora 32+# 2.0.4 (2020-02-27) Fedora 32+- update: also unbreak patching++# 2.0.3 (2020-02-24) - refresh: unbreak to patch spec file - spec: detect local revised .cabal file 

@@ -1,8 +1,7 @@ [![Build Status](https://travis-ci.org/juhp/cabal-rpm.png)](https://travis-ci.org/juhp/cabal-rpm)-[![Hackage](http://img.shields.io/hackage/v/cabal-rpm.png)](http://hackage.haskell.org/package/cabal-rpm)-[![Stackage LTS](http://stackage.org/package/cabal-rpm/badge/lts)](http://stackage.org/lts/package/cabal-rpm)-[![Stackage Nightly](http://stackage.org/package/cabal-rpm/badge/nightly)](http://stackage.org/nightly/package/cabal-rpm)-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cabal-rpm/Lobby?utm_source=badge&utm_medium=badge&utm_content=badge)+[![Hackage](https://img.shields.io/hackage/v/cabal-rpm.png)](https://hackage.haskell.org/package/cabal-rpm)+[![Stackage LTS](https://stackage.org/package/cabal-rpm/badge/lts)](https://stackage.org/lts/package/cabal-rpm)+[![Stackage Nightly](https://stackage.org/package/cabal-rpm/badge/nightly)](https://stackage.org/nightly/package/cabal-rpm) [![license](https://img.shields.io/badge/license-GPLv3+-brightgreen.svg)](https://www.gnu.org/licenses/gpl.html)  # cabal-rpm@@ -81,6 +80,9 @@  ## Development The latest source code is available from: https://github.com/juhp/cabal-rpm++There is an Freenode irc channel #haskell-rpm for rpm distro packaging+discussion.  ## Plans More features are planned and patches welcome.

@@ -1,5 +1,5 @@ - support internal libs: eg dns-internal-- fix lts package version check to not fallback to ignore old snapshot results+- fix lts package version check to ignore old snapshot results - diff misses flags in subpackages: eg skylighting-core - cabal-tweak-drop-dep "ignored" by update etc - switch to v2 commands@@ -9,6 +9,8 @@ - use .Cblrpm/ for refresh? - delete unrevised .cabal? - changelog for subpkg bumps+- update --stream should add --stream to header+- cleanup .Cblrpm  - --without-tests/--disable-tests/--no-tests (also for install etc)   - or default to no tests and explicitly enable with --tests

@@ -1,5 +1,5 @@ Name:                cabal-rpm-Version:             2.0.3+Version:             2.0.4 Synopsis:            RPM packaging tool for Haskell Cabal-based packages Description:     This package provides a RPM packaging tool for Haskell Cabal-based packages.@@ -11,7 +11,7 @@     a freshly generated one, the update command updates the spec file to latest     version from Stackage or Hackage, and the refresh command updates the spec     file to the current cabal-rpm packaging. It also handles Hackage revisions of-    packages. Standalone packages can also be packaged built with cabal-install.+    packages. Standalone packages can also be made, built with cabal-install. Homepage:            https://github.com/juhp/cabal-rpm Bug-reports:         https://github.com/juhp/cabal-rpm/issues License:             GPL-3@@ -26,7 +26,7 @@ Cabal-version:       >=1.6 Tested-with:         GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3,                      GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,-                     GHC == 8.6.5, GHC == 8.8.1+                     GHC == 8.6.5, GHC == 8.8.2  source-repository head   type:     git

@@ -431,7 +431,7 @@     out <- cmdIgnoreErr "patch" opts diff     putStrLn out   where-    opts = ["--fuzz=1"] ++ ["-p" ++ show n | let n = count '/' newspec] ++ maybe [] (\ d -> ["-d", d]) mdir+    opts = ["--fuzz=1"] ++ ["-p" ++ show n | let n = count '/' (removePrefix ".Cblrpm/" newspec)] ++ maybe [] (\ d -> ["-d", d]) mdir      count :: Eq a => a -> [a] -> Int     count x =  length . filter (==x)