From b3a36cde2a4e9f4ec8b7ce96bbb3b3a50cf2ebf1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 14 Feb 2020 12:07:50 +0800 Subject: [PATCH] update to 1.9.2.2 --- .gitignore | 1 + ghc-time-compat.spec | 31 +++++-- sources | 2 +- time-compat-1.9.2.2.cabal | 169 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 197 insertions(+), 6 deletions(-) create mode 100644 time-compat-1.9.2.2.cabal diff --git a/.gitignore b/.gitignore index 7781cf5..294751d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /time-compat-0.1.0.3.tar.gz +/time-compat-1.9.2.2.tar.gz diff --git a/ghc-time-compat.spec b/ghc-time-compat.spec index 8bfbcde..db47d56 100644 --- a/ghc-time-compat.spec +++ b/ghc-time-compat.spec @@ -4,27 +4,40 @@ %global pkg_name time-compat %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 0.1.0.3 -Release: 14%{?dist} -Summary: Compatibility with old-time for the time package +Version: 1.9.2.2 +Release: 1%{?dist} +Summary: Compatibility package for time 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 BuildRequires: ghc-base-prof -BuildRequires: ghc-old-time-prof +BuildRequires: ghc-base-orphans-prof +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-time-prof +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-compat-devel +BuildRequires: ghc-tagged-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel +%endif # End cabal-rpm deps %description -Compatibility with the old-time package for the "new" time package. +This packages tries to compat as much of 'time' features as possible. %package devel @@ -64,6 +77,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} +cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -79,6 +93,10 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%check +%cabal_test + + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -110,6 +128,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen - 1.9.2.2-1 +- update to 1.9.2.2 + * Tue Jan 28 2020 Fedora Release Engineering - 0.1.0.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 34fc5f8..c8c587b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (time-compat-0.1.0.3.tar.gz) = d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6 +SHA512 (time-compat-1.9.2.2.tar.gz) = 210e1d6b6b1dcf30337c72d45dd5f229dfbd023a1612f13dccad23131f16437b2b6a43a46e5e1341751c7b6f88f8ef1a9b5efe91b1328b12ff20552e2a952f44 diff --git a/time-compat-1.9.2.2.cabal b/time-compat-1.9.2.2.cabal new file mode 100644 index 0000000..f518d4e --- /dev/null +++ b/time-compat-1.9.2.2.cabal @@ -0,0 +1,169 @@ +cabal-version: 1.12 +name: time-compat +version: 1.9.2.2 +x-revision: 2 +synopsis: Compatibility package for time +description: + This packages tries to compat as much of @time@ features as possible. + . + /TODO:/ + . + * Difference type @ParseTime@ and @FormatTime@ instances are missing. + . + * Formatting varies depending on underlying @time@ version + . + * @dayFractionToTimeOfDay@ on extreme values + +category: Time, Compatibility +license: BSD3 +license-file: LICENSE +maintainer: Oleg Grenrus +author: Ashley Yakeley +homepage: https://github.com/phadej/time-compat +bug-reports: https://github.com/phadej/time-compat/issues +build-type: Simple +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.5 + || ==8.8.2 + || ==8.10.1 + +source-repository head + type: git + location: https://github.com/phadej/time-compat.git + +flag old-locale + description: If true, use old-locale, otherwise use time 1.5 or newer. + manual: False + default: False + +library + default-language: Haskell2010 + hs-source-dirs: src + other-extensions: CPP + + if impl(ghc >=7.2) + default-extensions: Trustworthy + + build-depends: + base >=4.3 && <4.15 + , base-orphans >=0.8.1 && <0.9 + , deepseq >=1.3.0.0 && <1.4 || >=1.4.1.1 && <1.5 + , time >=1.2 && <1.3 || >=1.4 && <1.7 || >=1.8 && <1.9 || >=1.9.2 && <1.9.4 + + if flag(old-locale) + build-depends: + old-locale >=1.0.0.2 && <1.1 + , time >=0 && <1.5 + + else + build-depends: time >=1.5 + + if !impl(ghc >=8.0) + build-depends: + fail >=4.9.0.0 && <4.10 + , semigroups >=0.18.5 && <0.20 + + exposed-modules: + Data.Time.Calendar.Compat + Data.Time.Calendar.Easter.Compat + Data.Time.Calendar.Julian.Compat + Data.Time.Calendar.MonthDay.Compat + Data.Time.Calendar.OrdinalDate.Compat + Data.Time.Calendar.WeekDate.Compat + Data.Time.Clock.Compat + Data.Time.Clock.POSIX.Compat + Data.Time.Clock.System.Compat + Data.Time.Clock.TAI.Compat + Data.Time.Compat + Data.Time.Format.Compat + Data.Time.Format.ISO8601.Compat + Data.Time.LocalTime.Compat + + other-modules: + Data.Format + Data.Time.Calendar.Private + Data.Time.Orphans + +test-suite instances + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Test.hs + build-depends: + base + , deepseq + , HUnit >=1.3.1 && <1.3.2 || >=1.6.0.0 && <1.7 + , time-compat + +-- This test-suite is from test library +test-suite main + if !impl(ghc >=7.4) + buildable: False + + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test/main + default-extensions: + CPP + DeriveDataTypeable + ExistentialQuantification + FlexibleInstances + MultiParamTypeClasses + Rank2Types + ScopedTypeVariables + StandaloneDeriving + TupleSections + UndecidableInstances + + ghc-options: -Wall -fwarn-tabs + build-depends: + base + , base-compat >=0.10.5 && <0.11 + , deepseq + , QuickCheck >=2.13 && <2.14 + , tagged >=0.8.6 && <0.9 + , tasty >=1.2.1 && <1.3 + , tasty-hunit >=0.10 && <0.11 + , tasty-quickcheck >=0.10 && <0.11 + , time-compat + + build-depends: time + main-is: Main.hs + other-modules: + Test.Arbitrary + Test.Calendar.AddDays + Test.Calendar.AddDaysRef + Test.Calendar.Calendars + Test.Calendar.CalendarsRef + Test.Calendar.ClipDates + Test.Calendar.ClipDatesRef + Test.Calendar.ConvertBack + Test.Calendar.Duration + Test.Calendar.Easter + Test.Calendar.EasterRef + Test.Calendar.LongWeekYears + Test.Calendar.LongWeekYearsRef + Test.Calendar.MonthDay + Test.Calendar.MonthDayRef + Test.Calendar.Valid + Test.Calendar.Week + Test.Clock.Conversion + Test.Clock.Resolution + Test.Clock.TAI + Test.Format.Format + Test.Format.ISO8601 + Test.Format.ParseTime + Test.LocalTime.CalendarDiffTime + Test.LocalTime.Time + Test.LocalTime.TimeOfDay + Test.LocalTime.TimeRef + Test.TestUtil