Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-fgl for openSUSE:Factory checked in at 2023-04-04 21:20:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-fgl (Old) and /work/SRC/openSUSE:Factory/.ghc-fgl.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-fgl" Tue Apr 4 21:20:00 2023 rev:7 rq:1075873 version:5.8.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-fgl/ghc-fgl.changes 2023-01-28 18:51:53.176854106 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-fgl.new.19717/ghc-fgl.changes 2023-04-04 21:20:11.885105354 +0200 @@ -2 +2 @@ -Thu Jan 26 21:28:27 UTC 2023 - Peter Simons <[email protected]> +Thu Mar 30 17:06:46 UTC 2023 - Peter Simons <[email protected]> @@ -4,8 +4 @@ -- Update fgl to version 5.8.1.0. - 5.8.1.0 - ------- - - * Data.Graph.Inductive.PatriciaTree.Gr and - Data.Graph.Inductive.Tree.Gr now have Functor instances. - - * 'Gr a' is now an instance of Functor. +- Updated spec file to conform with ghc-rpm-macros-2.5.2. Old: ---- fgl-5.8.1.0.tar.gz New: ---- fgl-5.8.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-fgl.spec ++++++ --- /var/tmp/diff_new_pack.ewN1PL/_old 2023-04-04 21:20:12.365108415 +0200 +++ /var/tmp/diff_new_pack.ewN1PL/_new 2023-04-04 21:20:12.373108466 +0200 @@ -17,9 +17,10 @@ %global pkg_name fgl +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.8.1.0 +Version: 5.8.0.0 Release: 0 Summary: Martin Erwig's Functional Graph Library License: BSD-3-Clause @@ -27,14 +28,22 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel +BuildRequires: ghc-array-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-prof %endif %description @@ -53,6 +62,22 @@ %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} @@ -77,4 +102,9 @@ %files devel -f %{name}-devel.files %doc ChangeLog +%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 ++++++ fgl-5.8.1.0.tar.gz -> fgl-5.8.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/ChangeLog new/fgl-5.8.0.0/ChangeLog --- old/fgl-5.8.1.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/ChangeLog 2001-09-09 03:46:40.000000000 +0200 @@ -1,11 +1,3 @@ -5.8.1.0 -------- - -* Data.Graph.Inductive.PatriciaTree.Gr and - Data.Graph.Inductive.Tree.Gr now have Functor instances. - -* 'Gr a' is now an instance of Functor. - 5.8.0.0 ------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/Data/Graph/Inductive/PatriciaTree.hs new/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs --- old/fgl-5.8.1.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/Data/Graph/Inductive/PatriciaTree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -134,9 +134,6 @@ rnf (Gr g) = rnf g #endif -instance Functor (Gr a) where - fmap = fastEMap - #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = fastNEMap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/Data/Graph/Inductive/Query/Dominators.hs new/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs --- old/fgl-5.8.1.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/Data/Graph/Inductive/Query/Dominators.hs 2001-09-09 03:46:40.000000000 +0200 @@ -51,7 +51,6 @@ idomWork :: (Graph gr) => gr a b -> Node -> (IDom, ToNode, FromNode) idomWork g root = let - nds = reachable root g -- use depth first tree from root do build the first approximation trees@(~[tree]) = dff [root] g -- relabel the tree so that paths from the root have increasing nodes @@ -59,7 +58,7 @@ -- the approximation iDom0 just maps each node to its parent iD0 = array (1, s-1) (tail $ treeEdges (-1) ntree) -- fromNode translates graph nodes to relabeled (internal) nodes - fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip nds (repeat (-1)))) + fromNode = I.unionWith const (I.fromList (zip (T.flatten tree) (T.flatten ntree))) (I.fromList (zip (nodes g) (repeat (-1)))) -- toNode translates internal nodes to graph nodes toNode = array (0, s-1) (zip (T.flatten ntree) (T.flatten tree)) preds = array (1, s-1) [(i, filter (/= -1) (map (fromNode I.!) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/Data/Graph/Inductive/Query/TransClos.hs new/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs --- old/fgl-5.8.1.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/Data/Graph/Inductive/Query/TransClos.hs 2001-09-09 03:46:40.000000000 +0200 @@ -34,8 +34,7 @@ G* = (V,Er union E) where Er = {(i,i): i in V} -} rc :: (DynGraph gr) => gr a b -> gr a () -rc g = (newEdges ++ oldEdges) `insEdges` insNodes ln empty +rc g = newEdges `insEdges` insNodes ln empty where ln = labNodes g newEdges = [ (u, u, ()) | (u, _) <- ln ] - oldEdges = [ (u, v, ()) | (u, v, _) <- labEdges g ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/Data/Graph/Inductive/Tree.hs new/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs --- old/fgl-5.8.1.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/Data/Graph/Inductive/Tree.hs 2001-09-09 03:46:40.000000000 +0200 @@ -135,9 +135,6 @@ rnf (Gr g) = rnf g #endif -instance Functor (Gr a) where - fmap = emap - #if MIN_VERSION_base (4,8,0) instance Bifunctor Gr where bimap = nemap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/fgl.cabal new/fgl-5.8.0.0/fgl.cabal --- old/fgl-5.8.1.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/fgl.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,9 +1,9 @@ name: fgl -version: 5.8.1.0 +version: 5.8.0.0 license: BSD3 license-file: LICENSE author: Martin Erwig, Ivan Lazar Miljenovic -maintainer: [email protected] +maintainer: [email protected] category: Data Structures, Graphs synopsis: Martin Erwig's Functional Graph Library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fgl-5.8.1.0/test/Data/Graph/Inductive/Query/Properties.hs new/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs --- old/fgl-5.8.1.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/fgl-5.8.0.0/test/Data/Graph/Inductive/Query/Properties.hs 2001-09-09 03:46:40.000000000 +0200 @@ -133,22 +133,14 @@ -- Dominators test_dom :: Spec -test_dom = describe "dom" $ do - it "regular dom" $ - sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) - , (2, [1,2]) - , (3, [1,2,3]) - , (4, [1,2,4]) - , (5, [1,2,5]) - , (6, [1,2,6]) - ] - it "multiple components dom" $ - sortIt (dom domGraph1 1) `shouldMatchList` [ (1, [1]) - , (2, [1, 2]) - ] - it "directed reachable components dom" $ - sortIt (dom domGraph2 1) `shouldMatchList` [ (1, [1]) ] - +test_dom = it "dom" $ + sortIt (dom domGraph 1) `shouldMatchList` [ (1, [1]) + , (2, [1,2]) + , (3, [1,2,3]) + , (4, [1,2,4]) + , (5, [1,2,5]) + , (6, [1,2,6]) + ] where sortIt = map (second sort) @@ -168,20 +160,6 @@ , (5,2) ] --- This graph has two components (independent subgraphs) -domGraph1 :: Gr () () -domGraph1 = mkUGraph [1..3] - [ (1,2) - ] - --- This graph has no reachables from 1 (but 1 is reachable) -domGraph2 :: Gr () () -domGraph2 = mkUGraph [1..3] - [ (2,1) - , (2,2) - ] - - -- ----------------------------------------------------------------------------- -- GVD
