summaryrefslogtreecommitdiffstats
path: root/archive
diff options
context:
space:
mode:
authorEric Sandall2020-06-05 20:36:02 +0000
committerEric Sandall2020-06-05 20:42:07 +0000
commitf780622ac596954d01a8a793864d595d7aa1d902 (patch)
treecc1af32c4872e6283e31e5e50dc8ae16cbccc366 /archive
parent636ff48710ffc9c9a0632871d29a518e38df92ca (diff)
xz-utils: Does not conflict with itself, breaks cast
Diffstat (limited to 'archive')
-rwxr-xr-xarchive/xz-utils/CONFLICTS1
-rw-r--r--archive/xz-utils/HISTORY5
2 files changed, 5 insertions, 1 deletions
diff --git a/archive/xz-utils/CONFLICTS b/archive/xz-utils/CONFLICTS
index beb8b32a6d..2e5eeb000b 100755
--- a/archive/xz-utils/CONFLICTS
+++ b/archive/xz-utils/CONFLICTS
@@ -1,2 +1 @@
conflicts lzma-utils y
-conflicts xz-utils y
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index cb62b1aff2..8f0d43d720 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,8 @@
+2020-06-05 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Doesn't conflict with itself
+ Causes upgrades/rebuilds to break as file links against liblzma.so.5
+ and then we cannot decompress any files via cast.
+
2020-03-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.5
* patches/pkglibdir.patch: removed