From 93a04440f955232f0c10b0c84bb88146ad374fdc Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 16 Jan 2025 11:42:18 +0100 Subject: mappings: Use rest1 on Alpine The rest1 package contains librest 0.9.1, while the rest package used to contain librest 0.8.4 since not all packages using librest were made compatible with the new version yet. As of a week ago, all compatibility issues have been resolved and the rest package has been dropped from Alpine edge. Since the rest1 package already existed even in Alpine 3.19, we can just switch to that one across the board. Signed-off-by: Andrea Bolognani --- lcitool/facts/mappings.yml | 2 +- tests/data/packages/out/alpine-319.yml | 2 +- tests/data/packages/out/alpine-320.yml | 2 +- tests/data/packages/out/alpine-edge.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index 8e7a6d7..3962f72 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1021,7 +1021,7 @@ mappings: cross-policy-default: foreign librest: - apk: rest-dev + apk: rest1-dev deb: librest-dev pkg: rest Fedora: rest-devel diff --git a/tests/data/packages/out/alpine-319.yml b/tests/data/packages/out/alpine-319.yml index 3fd67f2..23b804e 100644 --- a/tests/data/packages/out/alpine-319.yml +++ b/tests/data/packages/out/alpine-319.yml @@ -211,7 +211,7 @@ native: - qemu - qemu-img - readline-dev -- rest-dev +- rest1-dev - rpcgen - rpm2cpio - ruby-dev diff --git a/tests/data/packages/out/alpine-320.yml b/tests/data/packages/out/alpine-320.yml index 3fd67f2..23b804e 100644 --- a/tests/data/packages/out/alpine-320.yml +++ b/tests/data/packages/out/alpine-320.yml @@ -211,7 +211,7 @@ native: - qemu - qemu-img - readline-dev -- rest-dev +- rest1-dev - rpcgen - rpm2cpio - ruby-dev diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml index 3fd67f2..23b804e 100644 --- a/tests/data/packages/out/alpine-edge.yml +++ b/tests/data/packages/out/alpine-edge.yml @@ -211,7 +211,7 @@ native: - qemu - qemu-img - readline-dev -- rest-dev +- rest1-dev - rpcgen - rpm2cpio - ruby-dev -- cgit v1.1