Hello community,
here is the log from the commit of package ghc-turtle for openSUSE:Factory
checked in at 2020-03-09 14:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-turtle (Old)
and /work/SRC/openSUSE:Factory/.ghc-turtle.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-turtle"
Mon Mar 9 14:17:07 2020 rev:10 rq:780039 version:1.5.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-turtle/ghc-turtle.changes 2019-12-27
13:58:42.848813285 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-turtle.new.26092/ghc-turtle.changes
2020-03-09 14:17:09.454655860 +0100
@@ -1,0 +2,8 @@
+Tue Jan 21 03:08:25 UTC 2020 - psim...@suse.com
+
+- Update turtle to version 1.5.16.
+ 1.5.16
+
+ * Add `cptreeL`
+
+-------------------------------------------------------------------
Old:
----
turtle-1.5.15.tar.gz
turtle.cabal
New:
----
turtle-1.5.16.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-turtle.spec ++++++
--- /var/tmp/diff_new_pack.fDaCYb/_old 2020-03-09 14:17:10.462656525 +0100
+++ /var/tmp/diff_new_pack.fDaCYb/_new 2020-03-09 14:17:10.470656530 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-turtle
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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,13 +19,12 @@
%global pkg_name turtle
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.5.15
+Version: 1.5.16
Release: 0
Summary: Shell programming, Haskell-style
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-ansi-wl-pprint-devel
BuildRequires: ghc-async-devel
@@ -99,7 +98,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ turtle-1.5.15.tar.gz -> turtle-1.5.16.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/turtle-1.5.15/CHANGELOG.md
new/turtle-1.5.16/CHANGELOG.md
--- old/turtle-1.5.15/CHANGELOG.md 2019-09-19 15:36:21.000000000 +0200
+++ new/turtle-1.5.16/CHANGELOG.md 2020-01-20 18:52:57.000000000 +0100
@@ -1,3 +1,7 @@
+1.5.16
+
+* Add `cptreeL`
+
1.5.15
* Add `toLines`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/turtle-1.5.15/src/Turtle/Bytes.hs
new/turtle-1.5.16/src/Turtle/Bytes.hs
--- old/turtle-1.5.15/src/Turtle/Bytes.hs 2019-09-19 15:36:21.000000000
+0200
+++ new/turtle-1.5.16/src/Turtle/Bytes.hs 2020-01-20 18:52:57.000000000
+0100
@@ -49,6 +49,7 @@
import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.Managed (MonadManaged(..))
import Data.ByteString (ByteString)
+import Data.Monoid
import Data.Streaming.Zlib (Inflate, Popper, PopperRes(..), WindowBits(..))
import Data.Text (Text)
import Data.Text.Encoding (Decoding(..))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/turtle-1.5.15/src/Turtle/Prelude.hs
new/turtle-1.5.16/src/Turtle/Prelude.hs
--- old/turtle-1.5.15/src/Turtle/Prelude.hs 2019-09-19 15:36:21.000000000
+0200
+++ new/turtle-1.5.16/src/Turtle/Prelude.hs 2020-01-20 18:52:57.000000000
+0100
@@ -127,6 +127,7 @@
, mktree
, cp
, cptree
+ , cptreeL
#if !defined(mingw32_HOST_OS)
, symlink
#endif
@@ -1108,7 +1109,7 @@
isNotSymbolicLink :: MonadIO io => FilePath -> io Bool
isNotSymbolicLink = fmap (not . PosixCompat.isSymbolicLink) . lstat
--- | Copy a directory tree
+-- | Copy a directory tree and preserve symbolic links
cptree :: MonadIO io => FilePath -> FilePath -> io ()
cptree oldTree newTree = sh (do
oldPath <- lsif isNotSymbolicLink oldTree
@@ -1140,6 +1141,18 @@
else do
mktree newPath )
+-- | Copy a directory tree and dereference symbolic links
+cptreeL :: MonadIO io => FilePath -> FilePath -> io ()
+cptreeL oldTree newTree = sh (do
+ oldPath <- lstree oldTree
+ Just suffix <- return (Filesystem.stripPrefix (oldTree </> "") oldPath)
+ let newPath = newTree </> suffix
+ isFile <- testfile oldPath
+ if isFile
+ then mktree (Filesystem.directory newPath) >> cp oldPath newPath
+ else mktree newPath )
+
+
-- | Remove a file
rm :: MonadIO io => FilePath -> io ()
rm path = liftIO (Filesystem.removeFile path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/turtle-1.5.15/turtle.cabal
new/turtle-1.5.16/turtle.cabal
--- old/turtle-1.5.15/turtle.cabal 2019-09-19 15:36:21.000000000 +0200
+++ new/turtle-1.5.16/turtle.cabal 2020-01-20 18:52:57.000000000 +0100
@@ -1,5 +1,5 @@
Name: turtle
-Version: 1.5.15
+Version: 1.5.16
Cabal-Version: >=1.10
Build-Type: Simple
License: BSD3
