Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-doclayout for openSUSE:Factory checked in at 2023-04-04 21:19:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-doclayout (Old) and /work/SRC/openSUSE:Factory/.ghc-doclayout.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-doclayout" Tue Apr 4 21:19:48 2023 rev:10 rq:1075859 version:0.4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-doclayout/ghc-doclayout.changes 2022-10-13 15:41:53.754708726 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-doclayout.new.19717/ghc-doclayout.changes 2023-04-04 21:19:56.673008367 +0200 @@ -1,0 +2,14 @@ +Thu Mar 30 17:06:38 UTC 2023 - Peter Simons <[email protected]> + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Sun Mar 26 04:36:02 UTC 2023 - Peter Simons <[email protected]> + +- Update doclayout to version 0.4.0.1. + ## 0.4.0.1 + + * Add clause for Empty to renderList (#22). + * Remove upper bound for criterion + +------------------------------------------------------------------- Old: ---- doclayout-0.4.tar.gz doclayout.cabal New: ---- doclayout-0.4.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-doclayout.spec ++++++ --- /var/tmp/diff_new_pack.6tQDqN/_old 2023-04-04 21:19:57.165011504 +0200 +++ /var/tmp/diff_new_pack.6tQDqN/_new 2023-04-04 21:19:57.169011529 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-doclayout # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,39 @@ %global pkg_name doclayout +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4 +Version: 0.4.0.1 Release: 0 Summary: A prettyprinting library for laying out text documents License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-emojis-devel +BuildRequires: ghc-emojis-prof BuildRequires: ghc-mtl-devel +BuildRequires: ghc-mtl-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-safe-devel +BuildRequires: ghc-safe-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-tasty-devel BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-golden-prof BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-hunit-prof +BuildRequires: ghc-tasty-prof BuildRequires: ghc-tasty-quickcheck-devel +BuildRequires: ghc-tasty-quickcheck-prof %endif %description @@ -56,9 +67,24 @@ %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -83,4 +109,9 @@ %files devel -f %{name}-devel.files +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog ++++++ doclayout-0.4.tar.gz -> doclayout-0.4.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doclayout-0.4/changelog.md new/doclayout-0.4.0.1/changelog.md --- old/doclayout-0.4/changelog.md 2022-04-02 06:44:38.000000000 +0200 +++ new/doclayout-0.4.0.1/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,10 @@ # doclayout +## 0.4.0.1 + + * Add clause for Empty to renderList (#22). + * Remove upper bound for criterion + ## 0.4 * Expose `unfoldD` [API change]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doclayout-0.4/doclayout.cabal new/doclayout-0.4.0.1/doclayout.cabal --- old/doclayout-0.4/doclayout.cabal 2022-04-02 05:47:41.000000000 +0200 +++ new/doclayout-0.4.0.1/doclayout.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: doclayout -version: 0.4 +version: 0.4.0.1 synopsis: A prettyprinting library for laying out text documents. description: doclayout is a prettyprinting library for laying out text documents, with several features not present @@ -57,7 +57,7 @@ Hs-Source-Dirs: bench Build-Depends: doclayout, base >= 4.8 && < 5, - criterion >= 1.0 && < 1.6, + criterion >= 1.0, deepseq, text, emojis >= 0.1.2, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doclayout-0.4/src/Text/DocLayout.hs new/doclayout-0.4.0.1/src/Text/DocLayout.hs --- old/doclayout-0.4/src/Text/DocLayout.hs 2022-04-02 23:30:03.000000000 +0200 +++ new/doclayout-0.4.0.1/src/Text/DocLayout.hs 2001-09-09 03:46:40.000000000 +0200 @@ -367,6 +367,8 @@ renderList :: HasChars a => [Doc a] -> DocState a renderList [] = return () +renderList (Empty : xs) = renderList xs + renderList (Text off s : xs) = do outp off s renderList xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doclayout-0.4/test/test.hs new/doclayout-0.4.0.1/test/test.hs --- old/doclayout-0.4/test/test.hs 2022-04-03 00:17:48.000000000 +0200 +++ new/doclayout-0.4.0.1/test/test.hs 2001-09-09 03:46:40.000000000 +0200 @@ -15,8 +15,11 @@ import Data.Semigroup #endif +timeout :: Integer +timeout = 480 * 10^(6 :: Int) + main :: IO () -main = defaultMain $ localOption (mkTimeout (480 * 10^6)) $ testGroup "Tests" tests +main = defaultMain $ localOption (mkTimeout timeout) $ testGroup "Tests" tests -- 8 minute timeout renderTest :: String -> Maybe Int -> Doc Text -> Text -> TestTree @@ -34,6 +37,11 @@ (lblock 4 (text "hi there" :: Doc Text)) "hi t\nhere" + , renderTest "lblock with blank line" + Nothing + (Block 5 ["a", "", "b"] :: Doc Text) + "a\nb" + , renderTest "nesting should not wrap" (Just 10) (nest 3 (text "abcdefghi" :: Doc Text))
