update to 3.14 version

Signed-off-by: geruijun <geruijun@huawei.com>
This commit is contained in:
geruijun 2020-07-18 10:26:07 +08:00
parent 24b28188fe
commit efa2c14de5
2 changed files with 83 additions and 17 deletions

View File

@ -1,8 +1,8 @@
#This spec file fetch from https://pagure.io/filesystem/blob/master/f/filesystem.spec #This spec file fetch from https://pagure.io/filesystem/blob/master/f/filesystem.spec
Summary: The basic directory layout for a Linux system Summary: The basic directory layout for a Linux system
Name: filesystem Name: filesystem
Version: 3.9 Version: 3.14
Release: 3 Release: 2
License: Public Domain License: Public Domain
URL: https://pagure.io/filesystem URL: https://pagure.io/filesystem
Group: System Environment/Base Group: System Environment/Base
@ -27,6 +27,14 @@ This subpackage of filesystem package contains just the file with
the directories owned by the filesystem package. This can be used the directories owned by the filesystem package. This can be used
during the build process instead of calling rpm -ql filesystem. 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 %prep
rm -f $RPM_BUILD_DIR/filelist rm -f $RPM_BUILD_DIR/filelist
@ -41,11 +49,11 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
cd %{buildroot} cd %{buildroot}
mkdir -p boot dev \ mkdir -p afs boot dev \
etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d,rwtab.d,statetab.d} \ 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} \
home media mnt opt proc root run srv sys tmp \ home media mnt opt proc root run srv sys tmp \
usr/{bin,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage,sse2},libexec,local/{bin,etc,games,lib,%{_lib},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},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} \
var/{adm,empty,ftp,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache,opt,games,yp} var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp}
#do not create the symlink atm. #do not create the symlink atm.
#ln -snf etc/sysconfig etc/default #ln -snf etc/sysconfig etc/default
@ -168,14 +176,19 @@ restorecon /var/lock 2>/dev/null >/dev/null || :
restorecon -r /usr/lib/debug/ 2>/dev/null >/dev/null || : restorecon -r /usr/lib/debug/ 2>/dev/null >/dev/null || :
restorecon /sys 2>/dev/null >/dev/null || : restorecon /sys 2>/dev/null >/dev/null || :
restorecon /boot 2>/dev/null >/dev/null || : restorecon /boot 2>/dev/null >/dev/null || :
restorecon /proc 2>/dev/null >/dev/null || :
restorecon /dev 2>/dev/null >/dev/null || : restorecon /dev 2>/dev/null >/dev/null || :
restorecon /media 2>/dev/null >/dev/null || : restorecon /media 2>/dev/null >/dev/null || :
%posttrans afs
restorecon /afs 2>/dev/null >/dev/null || :
%files content %files content
%dir %{_datadir}/filesystem %dir %{_datadir}/filesystem
%{_datadir}/filesystem/paths %{_datadir}/filesystem/paths
%files afs
%attr(555,root,root) /afs
%files -f filelist %files -f filelist
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)
%dir %attr(555,root,root) / %dir %attr(555,root,root) /
@ -187,7 +200,6 @@ restorecon /media 2>/dev/null >/dev/null || :
/etc/xdg /etc/xdg
/etc/opt /etc/opt
/etc/pm /etc/pm
/etc/xinetd.d
/etc/skel /etc/skel
/etc/sysconfig /etc/sysconfig
/etc/pki /etc/pki
@ -230,11 +242,10 @@ restorecon /media 2>/dev/null >/dev/null || :
%ghost /usr/lib/debug/usr/.dwz %ghost /usr/lib/debug/usr/.dwz
%ghost /usr/lib/debug/sbin %ghost /usr/lib/debug/sbin
%attr(555,root,root) /usr/lib/games %attr(555,root,root) /usr/lib/games
%attr(555,root,root) /usr/lib/sse2
%ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64 %ifarch x86_64 ppc64 sparc64 s390x aarch64 ppc64le mips64 mips64el riscv64
%attr(555,root,root) /usr/%{_lib} %attr(555,root,root) /usr/%{_lib}
%else %else
%attr(555,root,root) /usr/lib/tls %attr(555,root,root) /usr/lib/bpf
%attr(555,root,root) /usr/lib/X11 %attr(555,root,root) /usr/lib/X11
%attr(555,root,root) /usr/lib/pm-utils %attr(555,root,root) /usr/lib/pm-utils
%endif %endif
@ -277,12 +288,12 @@ restorecon /media 2>/dev/null >/dev/null || :
/usr/tmp /usr/tmp
%dir /var %dir /var
/var/adm /var/adm
/var/cache %dir /var/cache
/var/cache/bpf
/var/db /var/db
/var/empty /var/empty
/var/ftp /var/ftp
/var/games /var/games
/var/gopher
/var/lib /var/lib
/var/local /var/local
%ghost /var/lock %ghost /var/lock
@ -299,11 +310,27 @@ restorecon /media 2>/dev/null >/dev/null || :
/var/yp /var/yp
%changelog %changelog
* Tue Sep 10 2019 linmiaohe <linmiaohe@huawei.com> - 3.9-3 * Fri Jul 17 2020 Ruijun Ge <geruijun@huawei.com> - 3.14-2
- Type:enhancemnet - update to 3.14 version
- ID:NA
- SUG:NA * Mon Jan 27 2020 Ondrej Vasik <ovasik@redhat.com> - 3.14-1
- DESC:openEuler Debranding - do not restore context of /proc (#1722766)
* Wed Dec 18 2019 Ondrej Vasik <ovasik@redhat.com> - 3.13-1
- add ownership for eBPF bytecode files directories (#1781646)
* Thu Jun 20 2019 David Howells <dhowells@redhat.com> - 3.12-1
- add new -afs supbackage for /afs directory (#FPC888,#1720232)
* Mon Apr 29 2019 Ondrej Vasik <ovasik@redhat.com> - 3.11-1
- drop ownership for /etc/xinet.d (#1691146)
- drop ownership for %{_libdir}/tls, %{_libdir}/sse2 (#1702329)
* Mon Feb 11 2019 Ondrej Vasik <ovasik@redhat.com> - 3.10-1
- drop legacy /var/gopher (#1667231)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-2 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

39
iso_639_3.sed Normal file
View File

@ -0,0 +1,39 @@
#This sed file for parsing iso639-3 file is not in use at the moment
#(as there are too many entries - but keeping it for future use)
1,/<iso_639_3_entries/b
# on each new iso-code process the current one
\!\(<iso_639_3_entry\|</iso_639_entries>\)!{
x
s/^$//
# we are on the first iso-code--nothing to process here
t
# process and write to output
s/\s\+/ /g
s/<iso_639_3_entry//
s!/\s*>!!
# use '%' as a separator of parsed and unparsed input
s/\(.*\)id="\([^"]\+\)"\(.*\)/\2 % \1 \3/
t clear1
: clear1
s/\([^%]\+\)%\(.*\)part1_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
# clear subst. memory for the next t
t clear
# no 639-1 code--write xx
s/%/\tXX %/
:clear
t clear2
: clear2
s/\([^%]\+\)%\(.*\)part2_code="\([^"]\+\)"\(.*\)/\1\t\3 % \2 \4/
t name
# no 639-1 code--write xx
s/%/\tXX %/
:name
s/\([^%]\+\)%\(.*\)name="\([^"]\+\)"\(.*\)/\1\t\3/
s/ \t/\t/g
p
b
:noout
}
H