From 703bb2d15c1d6baa6e32f393cce93093cc53c8bdc64c18d38974dd5c3851d5c5 Mon Sep 17 00:00:00 2001
From: Jonathan Brielmaier <jbrielmaier@opensuse.org>
Date: Mon, 26 Nov 2018 12:11:27 +0000
Subject: [PATCH] Accepting request 651999 from home:jbrielmaier:guile2.2

- make rm independent of guile minor version
- update rpmlintrc

OBS-URL: https://build.opensuse.org/request/show/651999
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guix?expand=0&rev=24
---
 guix-rpmlintrc | 4 ++++
 guix.changes   | 6 ++++++
 guix.spec      | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/guix-rpmlintrc b/guix-rpmlintrc
index 37d0e42..ee20e8b 100644
--- a/guix-rpmlintrc
+++ b/guix-rpmlintrc
@@ -14,10 +14,14 @@ addFilter("W: statically-linked-binary /usr/share/guile/site/2.[02]/gnu/packages
 
 # they are foreign
 addFilter("W: missing-PT_GNU_STACK-section /usr/share/guile/site/2.[02]/gnu/packages/bootstrap/.*")
+addFilter("W: missing-PT_GNU_STACK-section /usr/lib64/guile/2.2/site-ccache/.*")
 
 # they are not position independent. Upstream consider to build them as PIE
 addFilter("W: position-independent-executable-suggested /usr/share/guile/site/2.[02]/gnu/packages/bootstrap/.*")
 
+# they doesn't include dependency information
+addFilter("W: shared-lib-without-dependency-information /usr/lib64/guile/2.[02]/site-ccache/.*")
+
 # I will add guixbuild group into rpmlint once I know that everything
 # else is correct
 addFilter("W: non-standard-gid /gnu/store guixbuild")
diff --git a/guix.changes b/guix.changes
index 548f7e3..c895d31 100644
--- a/guix.changes
+++ b/guix.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 26 11:09:49 UTC 2018 - jbrielmaier@suse.de
+
+- make rm independent of guile minor version
+- update rpmlintrc
+
 -------------------------------------------------------------------
 Thu Jul 12 13:10:08 UTC 2018 - jbrielmaier@suse.de
 
diff --git a/guix.spec b/guix.spec
index 2e7c35d..ddd9d78 100644
--- a/guix.spec
+++ b/guix.spec
@@ -122,7 +122,7 @@ install -m 0755 -t %{buildroot}%{_bindir} %{SOURCE21}
 sed -i 's@^ExecStart=.*@ExecStart=/usr/bin/run_guix_daemon.sh@' %{buildroot}%{_unitdir}/guix-daemon.service
 sed -i 's@^ExecStart=.*@ExecStart=/usr/bin/run_guix_publish.sh@' %{buildroot}%{_unitdir}/guix-publish.service
 # RPM throws error, due to be a development file. It's needed for guix pack -R. Disable it for now
-rm %{buildroot}%{_datadir}/guile/site/2.0/gnu/packages/aux-files/run-in-namespace.c
+rm %{buildroot}%{_datadir}/guile/site/2.*/gnu/packages/aux-files/run-in-namespace.c
 
 %pre
 %{_sbindir}/groupadd -r %{guix_builder_group} >/dev/null 2>/dev/null || :