- PLD merge

diff --git a/filesystem.spec b/filesystem.spec
index b4ca20dcdcf6d6de2140f1c0c9282038feb18d79..ad3e430a40536c2328942accaa2f3e4103d2d003 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:       7
+Release:       15
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -59,7 +59,7 @@ 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/{autostart,colors,menus}} \
+       $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/home/{users,services} \
        $RPM_BUILD_ROOT/lib/{firmware,security,udev/{hwdb.d,rules.d}} \
        $RPM_BUILD_ROOT/usr/include/{security,X11} \
@@ -68,16 +68,45 @@ install -d \
        $RPM_BUILD_ROOT/usr/src/examples \
        $RPM_BUILD_ROOT/var/lock/subsys \
        $RPM_BUILD_ROOT/var/log/archive \
-       $RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/{docklets,screensavers},%{_iconsdir},%{_pixmapsdir}} \
+       $RPM_BUILD_ROOT%{_aclocaldir} \
        $RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
        $RPM_BUILD_ROOT{%{_idldir},%{_privsepdir}} \
        $RPM_BUILD_ROOT/boot/efi/EFI \
        $RPM_BUILD_ROOT/etc/OpenCL/vendors
 
+# XDG Autostart specs: https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html
+install -d $RPM_BUILD_ROOT/etc/xdg/autostart
+
+# XDG Desktop Menus specs: https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html
+# (+custom AppDir hierarchy)
+install -d $RPM_BUILD_ROOT{/etc/xdg/menus/applications-merged,/usr/share/desktop-directories,%{_desktopdir}/{docklets,screensavers}}
+
+# XDG Icon Theme specs: https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
+# (top level only)
+install -d $RPM_BUILD_ROOT{%{_iconsdir},%{_pixmapsdir}}
+
+# XDG Sound Theme specs: https://specifications.freedesktop.org/sound-theme-spec/sound-theme-spec-latest.html
+# (top level only)
+install -d $RPM_BUILD_ROOT/usr/share/sounds
+
 > %{name}.lang
 install -d $RPM_BUILD_ROOT/usr/share/help/C
 
-for lang in af am ar as ast az be bg bn bn_IN br bs ca ca@valencia cmn crh cs cy da de dz el en_AU en_CA en_GB eo es es_CO et eu fa fi fr ga gl gu he hi hr hu hy id is it ja ka kk kn ko ku ky lt lv mai mg mk ml mn mr ms nb nds ne nl nn oc or pa pl ps pt pt_BR ro ru si sk sl sq sr sr@latin sv ta te th tr ug uk ur uz vi xh zh_CN zh_HK zh_TW; do
+for lang in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR \
+       be be@latin be@tarask bem bg bho bn bn_IN bo br brx bs byn \
+       ca ca@valencia ce chr ckb cmn crh cs csb cv cy \
+       da de de_AT de_CH doi dv dz \
+       el en en_AU en_CA en_GB en_NZ en@shaw en_US eo es \
+       es_AR es_CL es_CO es_CR es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY es_VE \
+       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 \
+       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 \
+       ta te tg th ti tig tk tl tlh tn tpi tr ts tt tt@iqtelif \
+       ug uk ur uz uz@cyrillic ve vi wa wal wo xh yi yo zh_CN zh_HK zh_TW zu; do
        install -d $RPM_BUILD_ROOT/usr/share/help/${lang}
        echo "%%lang($lang) %dir /usr/share/help/${lang}" >> %{name}.lang
 done
@@ -167,6 +196,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /etc/xdg/autostart
 %dir /etc/xdg/colors
 %dir /etc/xdg/menus
+%dir /etc/xdg/menus/applications-merged
 %dir /etc/NetworkManager
 %dir /etc/NetworkManager/dispatcher.d
 %dir /home/users
@@ -199,6 +229,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /usr/share/cmake
 %dir /usr/share/cmake/Modules
 %dir /usr/share/defaults
+%dir /usr/share/desktop-directories
 %dir /usr/share/factory
 %dir /usr/share/factory/etc
 %dir /usr/share/factory/etc/pam.d