From 7b15a54073f7cd48327c5967d49457414bd79c07 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 17 Feb 2019 22:44:28 +0800 Subject: [PATCH] refresh to cabal-rpm-0.13 --- echo-0.1.3.cabal | 124 +++++++++++++++++++++++------------------------ ghc-echo.spec | 21 ++++++-- 2 files changed, 79 insertions(+), 66 deletions(-) diff --git a/echo-0.1.3.cabal b/echo-0.1.3.cabal index 6c5883c..27d3750 100644 --- a/echo-0.1.3.cabal +++ b/echo-0.1.3.cabal @@ -1,62 +1,62 @@ -name: echo -version: 0.1.3 -x-revision: 1 -synopsis: A cross-platform, cross-console way to handle echoing terminal input -description: The @base@ library exposes the @hGetEcho@ and @hSetEcho@ functions - for querying and setting echo status, but unfortunately, neither - function works with MinTTY consoles on Windows. This is a serious - issue, since @hGetEcho@ and @hSetEcho@ are often used to disable - input echoing when a program prompts for a password, so many - programs will reveal your password as you type it on MinTTY! - . - This library provides an alternative interface which works - with both MinTTY and other consoles. An example is included - which demonstrates how one might prompt for a password using - this library. To build it, make sure to configure with the - @-fexample@ flag. -homepage: https://github.com/RyanGlScott/echo -bug-reports: https://github.com/RyanGlScott/echo/issues -license: BSD3 -license-file: LICENSE -author: Ryan Scott -maintainer: Ryan Scott -stability: Provisional -copyright: (C) 2016-2017 Ryan Scott -category: System -build-type: Simple -extra-source-files: CHANGELOG.md, README.md -cabal-version: >=1.10 - -source-repository head - type: git - location: https://github.com/RyanGlScott/echo - -flag example - description: Build the bundled example program. - default: False - -library - exposed-modules: System.IO.Echo - System.IO.Echo.Internal - - build-depends: base >= 4.3 && < 5 - , process >= 1.0.1.1 && < 1.7 - if os(windows) - cpp-options: "-DWINDOWS" - build-depends: mintty >= 0.1 && < 0.2 - , Win32 >= 2 && < 3 - - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall - -executable password - if !flag(example) - buildable: False - - main-is: Password.hs - build-depends: base >= 4.3 && < 5 - , echo - hs-source-dirs: example - default-language: Haskell2010 - ghc-options: -Wall +name: echo +version: 0.1.3 +x-revision: 1 +synopsis: A cross-platform, cross-console way to handle echoing terminal input +description: The @base@ library exposes the @hGetEcho@ and @hSetEcho@ functions + for querying and setting echo status, but unfortunately, neither + function works with MinTTY consoles on Windows. This is a serious + issue, since @hGetEcho@ and @hSetEcho@ are often used to disable + input echoing when a program prompts for a password, so many + programs will reveal your password as you type it on MinTTY! + . + This library provides an alternative interface which works + with both MinTTY and other consoles. An example is included + which demonstrates how one might prompt for a password using + this library. To build it, make sure to configure with the + @-fexample@ flag. +homepage: https://github.com/RyanGlScott/echo +bug-reports: https://github.com/RyanGlScott/echo/issues +license: BSD3 +license-file: LICENSE +author: Ryan Scott +maintainer: Ryan Scott +stability: Provisional +copyright: (C) 2016-2017 Ryan Scott +category: System +build-type: Simple +extra-source-files: CHANGELOG.md, README.md +cabal-version: >=1.10 + +source-repository head + type: git + location: https://github.com/RyanGlScott/echo + +flag example + description: Build the bundled example program. + default: False + +library + exposed-modules: System.IO.Echo + System.IO.Echo.Internal + + build-depends: base >= 4.3 && < 5 + , process >= 1.0.1.1 && < 1.7 + if os(windows) + cpp-options: "-DWINDOWS" + build-depends: mintty >= 0.1 && < 0.2 + , Win32 >= 2 && < 3 + + hs-source-dirs: src + default-language: Haskell2010 + ghc-options: -Wall + +executable password + if !flag(example) + buildable: False + + main-is: Password.hs + build-depends: base >= 4.3 && < 5 + , echo + hs-source-dirs: example + default-language: Haskell2010 + ghc-options: -Wall diff --git a/ghc-echo.spec b/ghc-echo.spec index e26c6c1..cdb9768 100644 --- a/ghc-echo.spec +++ b/ghc-echo.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-0.12.5 +# generated by cabal-rpm-0.13 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name echo @@ -6,17 +6,19 @@ Name: ghc-%{pkg_name} Version: 0.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A cross-platform, cross-console way to handle echoing terminal input License: BSD 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-rpm-macros -# Begin cabal-rpm deps: BuildRequires: ghc-process-devel # End cabal-rpm deps @@ -49,16 +51,22 @@ This package provides the Haskell %{pkg_name} library development files. %prep +# Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -p %{SOURCE1} %{pkg_name}.cabal +cp -bp %{SOURCE1} %{pkg_name}.cabal +# End cabal-rpm setup %build +# Begin cabal-rpm build: %ghc_lib_build +# End cabal-rpm build %install +# Begin cabal-rpm install %ghc_lib_install +# End cabal-rpm install %post devel @@ -70,7 +78,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files -f %{name}.files +# Begin cabal-rpm files: %license LICENSE +# End cabal-rpm files %files devel -f %{name}-devel.files @@ -78,6 +88,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Feb 17 2019 Jens Petersen - 0.1.3-7 +- refresh to cabal-rpm-0.13 + * Sat Feb 16 2019 Jens Petersen - 0.1.3-6 - use revised .cabal file