branch master updated: pack: Register extra /usr/share sub-directories as FHS.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1fee391a25 pack: Register extra /usr/share sub-directories as FHS.
1fee391a25 is described below

commit 1fee391a254377aa7d88400eafa24105c5f26486
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Feb 21 23:37:09 2023 -0500

    pack: Register extra /usr/share sub-directories as FHS.
    
    * guix/rpm.scm (%fhs-directories): Add extra FHS directories.  They were 
found
    to conflict while testing a 'guix pack' built Jami RPM.
---
 guix/rpm.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/guix/rpm.scm b/guix/rpm.scm
index 1cb8326a9b..734aef29c1 100644
--- a/guix/rpm.scm
+++ b/guix/rpm.scm
@@ -393,8 +393,15 @@ encountered, translate it to \"/\"."
         "/opt/info" "/opt/lib" "/opt/man"
         "/run" "/sbin" "/srv" "/sys" "/tmp"
         "/usr" "/usr/bin" "/usr/include" "/usr/libexec"
+        "/usr/share" "/usr/share/applications"
         "/usr/share/color" "/usr/share/dict" "/usr/share/doc" 
"/usr/share/games"
-        "/usr/share/info" "/usr/share/locale" "/usr/share/man" 
"/usr/share/misc"
+        "/usr/share/icons" "/usr/share/icons/hicolor"
+        "/usr/share/icons/hicolor/48x48"
+        "/usr/share/icons/hicolor/48x48/apps"
+        "/usr/share/icons/hicolor/scalable"
+        "/usr/share/icons/hicolor/scalable/apps"
+        "/usr/share/info" "/usr/share/locale" "/usr/share/man"
+        "/usr/share/metainfo" "/usr/share/misc"
         "/usr/share/nls" "/usr/share/ppd" "/usr/share/sgml"
         "/usr/share/terminfo" "/usr/share/tmac" "/usr/share/xml"
         "/usr/share/zoneinfo" "/usr/local" "/usr/local/bin" "/usr/local/etc"