From c6a9757ce26626640bd0e61018f9c442efac9ac4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 30 Jul 2018 13:09:42 +0900 Subject: [PATCH] Fedora 29 is tracking lts-11 --- cabal-rpm-lts.patch | 11 +++++++++++ cabal-rpm.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cabal-rpm-lts.patch diff --git a/cabal-rpm-lts.patch b/cabal-rpm-lts.patch new file mode 100644 index 0000000..a87a3d5 --- /dev/null +++ b/cabal-rpm-lts.patch @@ -0,0 +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 diff --git a/cabal-rpm.spec b/cabal-rpm.spec index b065d5b..6726d13 100644 --- a/cabal-rpm.spec +++ b/cabal-rpm.spec @@ -9,7 +9,7 @@ Name: cabal-rpm Version: 0.12.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM packaging tool for Haskell Cabal-based packages License: GPLv3+ @@ -17,6 +17,8 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: cblrpm.1 +Patch1: cabal-rpm-lts.patch + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: @@ -67,6 +69,7 @@ current cabal-rpm packaging. %prep %setup -q +%patch1 -p1 -b .orig %build @@ -91,6 +94,9 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm %changelog +* Mon Jul 30 2018 Jens Petersen - 0.12.5-2 +- patch default tracked stream to lts-11 + * Sun Jul 29 2018 Jens Petersen - 0.12.5-1 - improvements to update and refresh - improved revising of .cabal files