From cd51e451b791a301f536a4d0bc9ff950dc50311b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 10 Jun 2020 11:27:25 +0800 Subject: [PATCH] update to 1.3.1.0 --- .gitignore | 1 + ghc-hslogger.spec | 33 +++++++++----- hslogger-1.2.12.cabal | 83 ----------------------------------- hslogger-1.3.1.0.cabal | 98 ++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 123 insertions(+), 94 deletions(-) delete mode 100644 hslogger-1.2.12.cabal create mode 100644 hslogger-1.3.1.0.cabal diff --git a/.gitignore b/.gitignore index 5010288..8eedf00 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /hslogger-1.2.9.tar.gz /hslogger-1.2.10.tar.gz /hslogger-1.2.12.tar.gz +/hslogger-1.3.1.0.tar.gz diff --git a/ghc-hslogger.spec b/ghc-hslogger.spec index f441ddf..62b6146 100644 --- a/ghc-hslogger.spec +++ b/ghc-hslogger.spec @@ -4,9 +4,11 @@ %global pkg_name hslogger %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 1.2.12 -Release: 4%{?dist} +Version: 1.3.1.0 +Release: 1%{?dist} Summary: Versatile logging framework License: BSD @@ -20,24 +22,27 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof -BuildRequires: ghc-directory-prof -BuildRequires: ghc-mtl-prof +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-network-prof +BuildRequires: ghc-network-bsd-prof BuildRequires: ghc-old-locale-prof -BuildRequires: ghc-process-prof BuildRequires: ghc-time-prof BuildRequires: ghc-unix-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +%endif # End cabal-rpm deps %description -Hslogger is a logging framework for Haskell, roughly similar to Python's -logging module. +'hslogger' is a logging framework for Haskell, roughly similar to [Python's +logging module](https://docs.python.org/2/library/logging.html). -hslogger lets each log message have a priority and source be associated with +'hslogger' lets each log message have a priority and source be associated with it. The programmer can then define global handlers that route or filter -messages based on the priority and source. hslogger also has a syslog handler -built in. +messages based on the priority and source. 'hslogger' also has a +[Syslog](https://tools.ietf.org/html/rfc5424) handler built in. %package devel @@ -93,6 +98,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 @@ -110,6 +119,7 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files +%doc CHANGELOG.md %if %{with haddock} @@ -124,6 +134,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Wed Jun 10 2020 Jens Petersen - 1.3.1.0-1 +- update to 1.3.1.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/hslogger-1.2.12.cabal b/hslogger-1.2.12.cabal deleted file mode 100644 index 5f5e3a4..0000000 --- a/hslogger-1.2.12.cabal +++ /dev/null @@ -1,83 +0,0 @@ -Cabal-Version: >= 1.8 -Name: hslogger -Version: 1.2.12 -x-revision: 1 - -License: BSD3 -Maintainer: John Goerzen -Author: John Goerzen -Stability: Stable -Copyright: Copyright (c) 2004-2018 John Goerzen -license-file: LICENSE -build-type: Simple -Homepage: http://software.complete.org/hslogger -Synopsis: Versatile logging framework -Description: hslogger is a logging framework for Haskell, roughly similar to - Python's logging module. - . - hslogger lets each log message have a priority and source be associated - with it. The programmer can then define global handlers that route - or filter messages based on the priority and source. hslogger also - has a syslog handler built in. -Category: Interfaces -extra-source-files: LICENSE, - contrib/java/build.xml, - contrib/java/hslogger4j.jar, - contrib/java/hslogger4j-plugins.xml, - contrib/java/org/haskell/hslogger/HsloggerLevel.java, - contrib/java/org/haskell/hslogger/LogFileXMLReceiver.java, - contrib/java/org/haskell/hslogger/XMLDecoder.java, - testsrc/Tests.hs, - testsrc/runtests.hs, - winbuild.bat -source-repository head - type: git - location: git@github.com:jgoerzen/hslogger.git - -flag small_base - description: choose the new smaller, split-up base package. - -flag buildtests - description: Build the executable to run unit tests - default: False - manual: True - -Library - Exposed-Modules: - System.Log, System.Log.Handler, System.Log.Formatter, - System.Log.Handler.Simple, System.Log.Handler.Syslog, - System.Log.Handler.Growl, System.Log.Handler.Log4jXML, - System.Log.Logger - Extensions: CPP, ExistentialQuantification - - Build-Depends: network < 2.9 - , mtl < 2.3 - - if !os(windows) - Build-Depends: unix < 2.8 - - if flag(small_base) - build-depends: base >= 4 && < 4.13 - , containers >= 0.4.2.1 && < 0.7 - , directory < 1.4 - , process < 1.7 - , time < 1.10 - , old-locale < 1.1 - else - build-depends: base < 3 - , time - - Hs-Source-Dirs: src - -test-suite runtests - type: exitcode-stdio-1.0 - if flag(buildtests) - Buildable: True - else - Buildable: False - Main-Is: runtests.hs - HS-Source-Dirs: testsrc, ., src - Extensions: ExistentialQuantification, OverlappingInstances, - UndecidableInstances, CPP - build-depends: base - , HUnit diff --git a/hslogger-1.3.1.0.cabal b/hslogger-1.3.1.0.cabal new file mode 100644 index 0000000..b09e9b9 --- /dev/null +++ b/hslogger-1.3.1.0.cabal @@ -0,0 +1,98 @@ +cabal-version: 1.12 +build-type: Simple +name: hslogger +version: 1.3.1.0 +x-revision: 1 + +maintainer: hvr@gnu.org +author: John Goerzen +copyright: Copyright (c) 2004-2018 John Goerzen + , (c) 2019 Herbert Valerio Riedel +license: BSD3 +license-file: LICENSE +homepage: https://github.com/hvr/hslogger/wiki +bug-reports: https://github.com/hvr/hslogger/issues +category: Interfaces +synopsis: Versatile logging framework +description: + @hslogger@ is a logging framework for Haskell, roughly similar + to [Python's logging module](https://docs.python.org/2/library/logging.html). + . + @hslogger@ lets each log message have a priority and source be associated + with it. The programmer can then define global handlers that route + or filter messages based on the priority and source. @hslogger@ also + has a [Syslog](https://tools.ietf.org/html/rfc5424) handler built in. + +extra-source-files: + LICENSE + CHANGELOG.md + contrib/java/build.xml + contrib/java/hslogger4j.jar + contrib/java/hslogger4j-plugins.xml + contrib/java/org/haskell/hslogger/HsloggerLevel.java + contrib/java/org/haskell/hslogger/LogFileXMLReceiver.java + contrib/java/org/haskell/hslogger/XMLDecoder.java + testsrc/Tests.hs + testsrc/runtests.hs + +tested-with: + GHC ==7.0.4 || ==7.2.2 || ==7.4.2 || ==7.6.3 || ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 + +source-repository head + type: git + location: http://github.com/hvr/hslogger.git + +flag network--GT-3_0_0 + description: [network](http://hackage.haskell.org/package/network) ≥ 3.0.0 + default: True + manual: False + +library + hs-source-dirs: src + exposed-modules: + System.Log + System.Log.Handler + System.Log.Formatter + System.Log.Handler.Simple + System.Log.Handler.Syslog + System.Log.Handler.Growl + System.Log.Handler.Log4jXML + System.Log.Logger + other-modules: + UTF8 + + default-language: Haskell2010 + other-extensions: CPP ExistentialQuantification DeriveDataTypeable + + build-depends: + base >= 4.3 && < 4.15 + , bytestring >= 0.9 && < 0.11 + , containers >= 0.4 && < 0.7 + , deepseq >= 1.1 && < 1.5 + , time >= 1.2 && < 1.10 + , old-locale >= 1.0 && < 1.1 + + if flag(network--GT-3_0_0) + build-depends: network-bsd >= 2.8.1 && <2.9, + network >= 3.0 && <3.2 + else + build-depends: network >= 2.6 && <2.9 + + if !os(windows) + Build-Depends: unix >= 2.4.2 && < 2.8 + + if !impl(ghc >= 7.6) + build-depends: ghc-prim + +test-suite runtests + type: exitcode-stdio-1.0 + + hs-source-dirs: testsrc + main-is: runtests.hs + other-modules: Tests + + default-language: Haskell2010 + build-depends: + base + , HUnit == 1.3.* || == 1.6.* + , hslogger diff --git a/sources b/sources index e4fe324..d873f56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hslogger-1.2.12.tar.gz) = a4dd318a2c1242dd289307a4b4b27d0bb74acd817eb39bbd205c215658e590436801f5277a1c91e8eb30fe8df6677a4b2901db24b52134b5e0ef9368536de861 +SHA512 (hslogger-1.3.1.0.tar.gz) = a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a