From bc1ef3a401b5adfa45d6cbb4010dbc1000e97a748b74448f7c17320c1f65b3a7 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 25 Nov 2022 11:44:53 +0000 Subject: [PATCH 1/2] - Update require to libguile-ssh14 - Remove unused rpmlintrc filters OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guix?expand=0&rev=46 --- guix-rpmlintrc | 37 ------------------------------------- guix.spec | 4 ++-- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/guix-rpmlintrc b/guix-rpmlintrc index 0b339b6..282c4f4 100644 --- a/guix-rpmlintrc +++ b/guix-rpmlintrc @@ -1,42 +1,5 @@ -# guix is bootstrapping package so there are some non-standard exceptions -# 1] it violates FHS (intentionally) - this is feature, not bug -addFilter("W: suse-filelist-forbidden-fhs23 /gnu is not allowed in FHS 2.3") - - -# 2] it contains foreign static binaries used for bootstrap see: -# https://www.gnu.org/software/guix/manual/html_node/Bootstrapping.html#Building-the-Bootstrap-Binaries - -# they are binaries in /usr/share -addFilter("E: arch-dependent-file-in-usr-share .*/usr/share/guile/site/3.*/gnu/packages/bootstrap/.*") - -# they are static binaries -addFilter("W: statically-linked-binary /usr/share/guile/site/3.*/gnu/packages/bootstrap/.*") - -# they are foreign -addFilter("W: missing-PT_GNU_STACK-section /usr/share/guile/site/3.*/gnu/packages/bootstrap/.*") - -# they are not position independent. Upstream consider to build them as PIE -addFilter("W: position-independent-executable-suggested /usr/share/guile/site/3.*/gnu/packages/bootstrap/.*") - -# 3] it contains precompiled .go files for GNU Guile (makes execution faster) -# they doesn't include dependency information -addFilter("W: shared-lib-without-dependency-information /usr/lib64/guile/3.*/site-ccache/.*") - -# they can't be stripped -addFilter("W: unstripped-binary-or-object /usr/lib64/guile/3.*/site-ccache/*") - -# they are foreign -addFilter("W: missing-PT_GNU_STACK-section /usr/lib64/guile/3.*/site-ccache/.*") - # 4] Other # Needed for "guix pack --relocatable", needed at runtime so no devel file # This file gots compiled by Guix with a compiler from Guix right before the # resulting "pack" gets build addFilter("E: devel-file-in-non-devel-package *") - -# I will add guixbuild group into rpmlint once I know that everything -# else is correct -addFilter("W: non-standard-gid /gnu/store guixbuild") - -# It ships a wrapper of Guile to reduce "locale warning" spam of the cli -addFilter("E: invalid-filepath-dependency *") diff --git a/guix.spec b/guix.spec index 2b7c58d..0c791c7 100644 --- a/guix.spec +++ b/guix.spec @@ -1,7 +1,7 @@ # # spec file for package guix # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -76,7 +76,7 @@ Requires: guile-ssh-devel Requires: guile-zlib Requires: gzip Requires: libgcrypt-devel -Requires: libguile-ssh13 +Requires: libguile-ssh14 Requires(pre): %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 From cf75625d170298f539324af21b94421505c960208b6267c3fa1b0fa32091fc2f Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 1 Dec 2022 15:35:02 +0000 Subject: [PATCH 2/2] Add missing changelog... OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guix?expand=0&rev=47 --- guix.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guix.changes b/guix.changes index 6f05e51..3e4a54d 100644 --- a/guix.changes +++ b/guix.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 1 15:33:30 UTC 2022 - Jonathan Brielmaier + +- Raise libguile-ssh to version 14 +- Remove no longer working lint filters + ------------------------------------------------------------------- Thu May 13 09:40:14 UTC 2021 - Jonathan Brielmaier