- PLD merge

diff --git a/filesystem.spec b/filesystem.spec
index ad3e430a40536c2328942accaa2f3e4103d2d003..40494a60d0123e3486cc2320647433dc172b9f1e 100644 (file)
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -6,7 +6,7 @@ Summary:        Common directories
 Summary(pl.UTF-8):     Wspólne katalogi
 Name:          filesystem
 Version:       4.1
-Release:       15
+Release:       19
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -59,12 +59,12 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d \
        $RPM_BUILD_ROOT/{initrd,selinux} \
-       $RPM_BUILD_ROOT/etc/{NetworkManager/dispatcher.d,X11/xinit/{xinput,xinitrc}.d,certs,cron.d,default,logrotate.d,fonts/conf.d,modprobe.d,modules-load.d,pki/{CA,tls},security,skel,sysconfig,sysctl.d,tmpwatch,xdg/colors} \
+       $RPM_BUILD_ROOT/etc/{NetworkManager/dispatcher.d,X11/xinit/{xinput,xinitrc}.d,certs,cron.d,default,logrotate.d,fonts/conf.d,modprobe.d,pki/{CA,tls},security,skel,sysconfig,tmpwatch,xdg/colors} \
        $RPM_BUILD_ROOT/home/{users,services} \
        $RPM_BUILD_ROOT/lib/{firmware,security,udev/{hwdb.d,rules.d}} \
        $RPM_BUILD_ROOT/usr/include/{security,X11} \
        $RPM_BUILD_ROOT/usr/lib/{ConsoleKit/run-session.d,browser-plugins,cgi-bin,cmake,mozilla/extensions,pkcs11,pkgconfig,initrd} \
-       $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,cmake/Modules,defaults,factory/etc/pam.d,fontconfig/conf.avail,gnome/help,mate/help,man/man{n,l},man/pl/mann,metainfo,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xdg-desktop-portal/portals,xsessions,zsh/site-functions} \
+       $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,bash-completion/completions,cmake/Modules,defaults,doc/gi-doc,factory/etc/pam.d,fish/vendor_completions.d,fontconfig/conf.avail,gnome/help,mate/help,man/man{n,l},man/pl/mann,metainfo,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xdg-desktop-portal/portals,xsessions,zsh/site-functions} \
        $RPM_BUILD_ROOT/usr/src/examples \
        $RPM_BUILD_ROOT/var/lock/subsys \
        $RPM_BUILD_ROOT/var/log/archive \
@@ -101,7 +101,7 @@ for lang in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR \
        et eu fa ff fi fil fo fr fr_BE fr_CA fr_CH fur fy ga gd gez gl gu gv \
        ha he hi hne hr hsb ht hu hy ia id ig ik is it it_CH iu ja \
        ka kab kg kk kl km kn ko kok ks ks@devanagari ku kw ky la lb lg li ln lo lt lv \
-       mai mg mhr mi mk ml mn mni mr ms mt my nb nds ne nl nl_BE nn nr nso oc om or \
+       mai mg mhr mi mk ml mn mni mr ms mt my nan nb nds ne nl nl_BE nn nr nso oc om or \
        pa pap pl ps pt pt_BR quz rm ro ru rw \
        sa sat sc sd sd@devanagari se shn si sid sk sl so sq \
        sr sr@ijekavian sr@ijekavianlatin sr@latin ss st sv sw szl \
@@ -134,7 +134,7 @@ check_filesystem_dirs() {
        TMPFILE=$(mktemp)
        # note: we must exclude from check all existing dirs belonging to FHS
        find | sed -e 's|^\.||g' -e '/^$/d' | LC_ALL=C sort | grep -v $TMPFILE | \
-       grep -E -v '^/(boot|etc|etc/X11|home|lib|lib64|libx32|usr|usr/include|usr/lib|usr/lib64|usr/libx32|usr/share|usr/share/man|usr/share/man/pl|usr/src|var|var/lib|var/lock|var/log)$' > $TMPFILE
+       grep -E -v '^/(boot|etc|etc/X11|home|lib|lib64|libx32|usr|usr/include|usr/lib|usr/lib64|usr/libx32|usr/share|usr/share/doc|usr/share/man|usr/share/man/pl|usr/src|var|var/lib|var/lock|var/log)$' > $TMPFILE
 
        if rpm -qpl $RPMFILE | grep -v '^/$' | LC_ALL=C sort | diff -u $TMPFILE - ; then
                rm -rf $RPM_BUILD_ROOT
@@ -177,20 +177,19 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /etc/OpenCL
 %dir /etc/OpenCL/vendors
 %attr(751,root,root) %dir /etc/certs
-%dir /etc/cron.d
+# root:crontab
+%attr(750,root,root) %dir /etc/cron.d
 %dir /etc/default
 %dir /etc/fonts
 %dir /etc/fonts/conf.d
 %dir /etc/logrotate.d
 %dir /etc/modprobe.d
-%dir /etc/modules-load.d
 %dir /etc/pki
 %dir /etc/pki/CA
 %dir /etc/pki/tls
 %attr(751,root,root) %dir /etc/security
 %dir /etc/skel
 %dir /etc/sysconfig
-%dir /etc/sysctl.d
 %dir /etc/tmpwatch
 %dir /etc/xdg
 %dir /etc/xdg/autostart
@@ -226,13 +225,18 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /usr/share/augeas/lenses
 %dir /usr/share/augeas/lenses/tests
 %dir /usr/share/backgrounds
+%dir /usr/share/bash-completion
+%dir /usr/share/bash-completion/completions
 %dir /usr/share/cmake
 %dir /usr/share/cmake/Modules
 %dir /usr/share/defaults
 %dir /usr/share/desktop-directories
+%dir /usr/share/doc/gi-doc
 %dir /usr/share/factory
 %dir /usr/share/factory/etc
 %dir /usr/share/factory/etc/pam.d
+%dir /usr/share/fish
+%dir /usr/share/fish/vendor_completions.d
 %dir /usr/share/fontconfig
 %dir /usr/share/fontconfig/conf.avail
 %dir /usr/share/gnome