Add /usr/share/modulefiles for environment modules

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.fmf/version

@@ -0,0 +1 @@
+1

filesystem.spec

@@ -1,16 +1,18 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
-Version: 3.14
-Release: 5%{?dist}
-License: Public Domain
+Version: 3.18
+Release: 9%{?dist}
+License: LicenseRef-Fedora-Public-Domain
 URL: https://pagure.io/filesystem
-Group: System Environment/Base
 Source1: https://pagure.io/filesystem/raw/master/f/lang-exceptions
 Source2: iso_639.sed
 Source3: iso_3166.sed
 BuildRequires: iso-codes
 Requires(pre): setup
 
+Provides:   filesystem-afs = %{version}-%{release}
+Obsoletes:  filesystem-afs <= 3.14-2
+
 %description
 The filesystem package is one of the basic packages that is installed
 on a Linux system. Filesystem contains the basic directory layout
@@ -26,15 +28,6 @@ This subpackage of filesystem package contains just the file with
 the directories owned by the filesystem package. This can be used
 during the build process instead of calling rpm -ql filesystem.
 
-%package afs
-Summary: AFS root directory from the filesystem package
-License: Public Domain
-
-%description afs
-This subpackage of filesystem package contains just the AFS filesystem
-dynamic root directory.  This can be used with packages that add an
-AFS client.
-
 %prep
 rm -f $RPM_BUILD_DIR/filelist
 
@@ -48,14 +41,17 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
 
 cd %{buildroot}
 
-mkdir -p afs boot dev \
-        etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,pki,bash_completion.d,rwtab.d,statetab.d} \
+Paths=(
+        afs boot dev \
+        etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,keys/ima,pki,bash_completion.d,rwtab.d,statetab.d} \
         home media mnt opt root run srv tmp \
-        usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11,wayland-sessions},src,src/kernels,src/debug} \
+        usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,systemd/{system,user},sysusers.d,tmpfiles.d},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,fish/vendor_completions.d,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,modulefiles,omf,pixmaps,sounds,themes,xsessions,X11/fonts,wayland-sessions,zsh/site-functions},src,src/kernels,src/debug} \
         var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp}
+)
+for i in "${Paths[@]}"; do
+    mkdir -p "$i"
+done
 
-#do not create the symlink atm.
-#ln -snf etc/sysconfig etc/default
 ln -snf ../var/tmp usr/tmp
 ln -snf spool/mail var/mail
 ln -snf usr/bin bin
@@ -171,32 +167,25 @@ posix.symlink("../run", "/var/run")
 posix.symlink("../run/lock", "/var/lock")
 return 0
 
-%posttrans
-#we need to restorecon on some dirs created in %pretrans or by other packages
-restorecon /var 2>/dev/null >/dev/null || :
-restorecon /var/run 2>/dev/null >/dev/null || :
-restorecon /var/lock 2>/dev/null >/dev/null || :
-restorecon -r /usr/lib/debug/ 2>/dev/null >/dev/null || :
-restorecon /sys 2>/dev/null >/dev/null || :
-restorecon /boot 2>/dev/null >/dev/null || :
-restorecon /dev 2>/dev/null >/dev/null || :
-restorecon /media 2>/dev/null >/dev/null || :
-
-%posttrans afs
-restorecon /afs 2>/dev/null >/dev/null || :
+%posttrans -p <lua>
+--# we need to restorecon on some dirs created in %pretrans or by other packages
+if posix.access ("/usr/sbin/restorecon", "x") then
+  rpm.execute("/usr/sbin/restorecon", "/var", "/var/run", "/var/lock", "/sys", "/boot", "/dev", "/media", "/afs")
+  rpm.execute("/usr/sbin/restorecon", "-r", "/usr/lib/debug")
+end
 
 %files content
 %dir %{_datadir}/filesystem
 %{_datadir}/filesystem/paths
 
-%files afs
-%attr(555,root,root) /afs
+
 
 %files -f filelist
 %defattr(0755,root,root,0755)
 %dir %attr(555,root,root) /
 /bin
 %attr(555,root,root) /boot
+%attr(555,root,root) /afs
 /dev
 %dir /etc
 /etc/X11
@@ -205,6 +194,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /etc/pm
 /etc/skel
 /etc/sysconfig
+/etc/keys
 /etc/pki
 /etc/bash_completion.d/
 %dir /etc/rwtab.d
@@ -230,6 +220,11 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /usr/include
 %dir %attr(555,root,root) /usr/lib
 %dir /usr/lib/sysimage
+%dir /usr/lib/systemd
+/usr/lib/systemd/system
+/usr/lib/systemd/user
+%dir /usr/lib/sysusers.d
+%dir /usr/lib/tmpfiles.d
 %dir /usr/lib/locale
 %dir /usr/lib/modules
 %dir /usr/lib/debug
@@ -237,7 +232,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 %ghost /usr/lib/debug/bin
 %ghost /usr/lib/debug/lib
 %ghost /usr/lib/debug/%{_lib}
-%ghost /usr/lib/debug/usr
+%ghost %dir /usr/lib/debug/usr
 %ghost /usr/lib/debug/usr/bin
 %ghost /usr/lib/debug/usr/sbin
 %ghost /usr/lib/debug/usr/lib
@@ -268,6 +263,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /usr/share/dict
 /usr/share/doc
 %attr(555,root,root) %dir /usr/share/empty
+/usr/share/fish
 /usr/share/games
 /usr/share/gnome
 /usr/share/help
@@ -280,13 +276,16 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /usr/share/metainfo
 /usr/share/mime-info
 /usr/share/misc
+%dir /usr/share/modulefiles
 /usr/share/omf
 /usr/share/pixmaps
 /usr/share/sounds
 /usr/share/themes
 /usr/share/xsessions
-/usr/share/X11
+%dir /usr/share/X11
+/usr/share/X11/fonts
 /usr/share/wayland-sessions
+/usr/share/zsh
 /usr/src
 /usr/tmp
 %dir /var
@@ -313,19 +312,55 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Wed Mar 13 2024 Orion Poplawski <orion@fedoraproject.org> - 3.18-9
+- Add /usr/share/modulefiles for environment modules
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.18-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Fri Jul 21 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 3.18-6
+- Add /etc/keys for initrd/kernel related keys
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 3.18-4
+- migrated to SPDX license
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug 09 2022 Martin Osvald <mosvald@redhat.com> - 3.18-2
+- Filesystem has a dependency on /bin/sh (rhbz#1306489)
+
+* Tue Jul 26 2022 Martin Osvald <mosvald@redhat.com> - 3.18-1
+- Filesystem has a dependency on /bin/sh (#1306489)
+- Add /usr/share/X11/fonts/ to default filesystem (#2107447)
+- Remove obsolete and forbidden Group tag
+- Own zsh and fish completions directories (rhbz#1312594)
+- Improve directory creation to avoid 'Argument list too long' error
+
+* Mon Jul 25 2022 Debarshi Ray <rishi@fedoraproject.org> - 3.17-1
+- Assume ownership of /usr/lib/tmpfiles.d
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Petr Menšík <pemensik@redhat.com> - 3.16-3
+- Include systemd directories for %unitdir and similar
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Aug  3 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.15-1
+- Move /afs into main package
 
 * Fri Aug 07 2020 Pavel Raiskup <praiskup@redhat.com> - 3.14-4
 - /proc and /sys made %%ghost to allow filesystem package updates in rootless
   container environments (rhbz#1548403)
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.14-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Mon Jan 27 2020 Ondrej Vasik <ovasik@redhat.com> - 3.14-1
 - do not restore context of /proc (#1722766)
 
@@ -466,7 +501,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 * Sun Jun 30 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-17
 - .dwz symlink is needed as well (#974130)
 
-* Wed Jun 20 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-16
+* Thu Jun 20 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-16
 - /var/run and /var/lock can't be in payload for some reason
 
 * Wed Jun 19 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-15

gating.yaml

@@ -0,0 +1,16 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts: [bodhi_update_push_testing]
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+#gating rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts: [bodhi_update_push_stable]
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

plans/all.fmf

@@ -0,0 +1,6 @@
+summary: Test plan with all Fedora tests
+discover:
+       how: fmf
+       url: https://src.fedoraproject.org/tests/filesystem.git
+execute:
+       how: tmt

tests/filesystem-should-own-usr-share-licenses/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses
-#   Description: Test if filesystem owns /usr/share/licenses
-#   Author: Robin Hack <rhack@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/filesystem/filesystem-should-own-usr-share-licenses
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Robin Hack <rhack@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Test if filesystem owns /usr/share/licenses" >> $(METADATA)
-	@echo "Type:            Regression" >> $(METADATA)
-	@echo "TestTime:        20m" >> $(METADATA)
-	@echo "RunFor:          filesystem" >> $(METADATA)
-	@echo "Requires:        filesystem lvm2" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-
-	rhts-lint $(METADATA)

tests/filesystem-should-own-usr-share-licenses/PURPOSE

@@ -1,4 +0,0 @@
-PURPOSE of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses
-Description: Test if filesystem should owns /usr/share/licenses
-Author: Robin Hack <rhack@redhat.com>
-Bug summary: filesystem should own /usr/share/licenses directory

tests/filesystem-should-own-usr-share-licenses/runtest.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses
-#   Description: Test if filesystem owns /usr/share/licenses
-#   Author: Robin Hack <rhack@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2016 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="filesystem"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-    	rlRun -s "LC_ALL=en_US.UTF-8 rpm -qf /usr/share/licenses/"
-
-	rlAssertNotGrep "file /usr/share/licenses is not owned by any package" "${rlRun_LOG}"
-	rlAssertGrep "^filesystem" "${rlRun_LOG}"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

tests/tests.yml

@@ -1,28 +0,0 @@
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - filesystem-should-own-usr-share-licenses
-    required_packages:
-    - filesystem
-    - lvm2
-- hosts: localhost
-  tags:
-  - container
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - filesystem-should-own-usr-share-licenses
-    required_packages:
-    - filesystem
-    - lvm2
-- hosts: localhost
-  tags:
-  - atomic
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - filesystem-should-own-usr-share-licenses
-