Hello community, here is the log from the commit of package ghc-dimensional for openSUSE:Factory checked in at 2017-03-12 20:04:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-dimensional (Old) and /work/SRC/openSUSE:Factory/.ghc-dimensional.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-dimensional" Sun Mar 12 20:04:11 2017 rev:2 rq:477835 version:1.0.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-dimensional/ghc-dimensional.changes 2017-03-01 23:42:48.152337736 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-dimensional.new/ghc-dimensional.changes 2017-03-12 20:04:14.315731280 +0100 @@ -1,0 +2,5 @@ +Mon Sep 26 06:52:00 UTC 2016 - [email protected] + +- Update to version 1.0.1.3 with cabal2obs. + +------------------------------------------------------------------- Old: ---- dimensional-1.0.1.2.tar.gz New: ---- dimensional-1.0.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dimensional.spec ++++++ --- /var/tmp/diff_new_pack.xEwFZS/_old 2017-03-12 20:04:14.915646391 +0100 +++ /var/tmp/diff_new_pack.xEwFZS/_new 2017-03-12 20:04:14.919645826 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-dimensional # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,14 @@ %global pkg_name dimensional %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.0.1.2 +Version: 1.0.1.3 Release: 0 Summary: Statically checked physical dimensions, using Type Families and Data Kinds License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-deepseq-devel BuildRequires: ghc-exact-pi-devel BuildRequires: ghc-numtype-dk-devel @@ -37,7 +36,6 @@ %if %{with tests} BuildRequires: ghc-HUnit-devel %endif -# End cabal-rpm deps %description Dimensional is a library providing data types for performing arithmetic with @@ -66,20 +64,14 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ dimensional-1.0.1.2.tar.gz -> dimensional-1.0.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dimensional-1.0.1.2/CHANGELOG.md new/dimensional-1.0.1.3/CHANGELOG.md --- old/dimensional-1.0.1.2/CHANGELOG.md 2016-05-19 23:49:57.000000000 +0200 +++ new/dimensional-1.0.1.3/CHANGELOG.md 2016-09-15 16:42:03.000000000 +0200 @@ -1,3 +1,7 @@ +1.0.1.3 (2016-09) +----------------- +* Fixed an issue with applying metric prefixes to units with non-rational conversion factors. + 1.0.1.2 (2016-05) ----------------- * Support for GHC 8.0.1-rc4, avoiding GHC Trac issue 12026. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dimensional-1.0.1.2/dimensional.cabal new/dimensional-1.0.1.3/dimensional.cabal --- old/dimensional-1.0.1.2/dimensional.cabal 2016-05-19 23:49:57.000000000 +0200 +++ new/dimensional-1.0.1.3/dimensional.cabal 2016-09-15 16:42:03.000000000 +0200 @@ -1,5 +1,5 @@ name: dimensional -version: 1.0.1.2 +version: 1.0.1.3 license: BSD3 license-file: LICENSE copyright: Bjorn Buckwalter 2006-2015 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dimensional-1.0.1.2/src/Numeric/Units/Dimensional.hs new/dimensional-1.0.1.3/src/Numeric/Units/Dimensional.hs --- old/dimensional-1.0.1.2/src/Numeric/Units/Dimensional.hs 2016-05-19 23:49:57.000000000 +0200 +++ new/dimensional-1.0.1.3/src/Numeric/Units/Dimensional.hs 2016-09-15 16:42:03.000000000 +0200 @@ -665,8 +665,11 @@ -- Supplying negative defining quantities is allowed and handled gracefully, but is discouraged -- on the grounds that it may be unexpected by other readers. mkUnitR :: Floating a => UnitName m -> ExactPi -> Unit m1 d a -> Unit m d a -mkUnitR n s' (Unit _ s x) | isExactZero s = error "Supplying zero as a conversion factor is not valid." - | otherwise = Unit n (s' Prelude.* s) (approximateValue s' Prelude.* x) +mkUnitR n s (Unit _ e _) | isExactZero s = error "Supplying zero as a conversion factor is not valid." + | otherwise = Unit n e' x' + where + e' = s Prelude.* e + x' = approximateValue e' -- | Forms a new atomic 'Unit' by specifying its 'UnitName' and its definition as a multiple of another 'Unit'. -- @@ -675,11 +678,12 @@ -- -- For more information see 'mkUnitR'. mkUnitQ :: Fractional a => UnitName m -> Rational -> Unit m1 d a -> Unit m d a -mkUnitQ n s' (Unit _ s _) | s' == 0 = error "Supplying zero as a conversion factor is not valid." - | Just q <- toExactRational s'' = Unit n s'' (fromRational q) - | otherwise = error "The resulting conversion factor is not an exact rational." +mkUnitQ n s (Unit _ e x) | s == 0 = error "Supplying zero as a conversion factor is not valid." + | Just x'' <- toExactRational e' = Unit n e' (fromRational x'') + | otherwise = Unit n e' x' where - s'' = fromRational s' Prelude.* s + e' = fromRational s Prelude.* e + x' = fromRational s Prelude.* x -- | Forms a new atomic 'Unit' by specifying its 'UnitName' and its definition as a multiple of another 'Unit'. -- @@ -688,8 +692,9 @@ -- -- For more information see 'mkUnitR'. mkUnitZ :: Num a => UnitName m -> Integer -> Unit m1 d a -> Unit m d a -mkUnitZ n s' (Unit _ s _) | s' == 0 = error "Supplying zero as a conversion factor is not valid." - | Just z <- toExactInteger s'' = Unit n s'' (fromInteger z) - | otherwise = error "The resulting conversion factor is not an exact integer." +mkUnitZ n s (Unit _ e x) | s == 0 = error "Supplying zero as a conversion factor is not valid." + | Just x'' <- toExactInteger e' = Unit n e' (fromInteger x'') + | otherwise = Unit n e' x' where - s'' = fromInteger s' Prelude.* s + e' = fromInteger s Prelude.* e + x' = fromInteger s Prelude.* x
