From a8f3181104b73ee6734eea79c256a4693649e7d6 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 10 Jul 2015 12:07:18 +0000 Subject: [PATCH] - partial PLD merge --- filesystem.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/filesystem.spec b/filesystem.spec index 26a91dc..7309958 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -1,6 +1,7 @@ # NOTE # - do not use any other user/group than "root", as then we have to depend on "setup" package. # see the gid_xxx macros and post scriptlet +# FIXME: verify shows changed groups of dirs changed this way # disable rpm generated debug package, we handle it differently here %define _enable_debug_packages 0 @@ -11,7 +12,7 @@ Summary: Common directories Summary(pl.UTF-8): Wspólne katalogi Name: filesystem Version: 4.0 -Release: 37 +Release: 42 License: GPL Group: Base BuildRequires: automake @@ -57,12 +58,12 @@ rm -rf $RPM_BUILD_ROOT install -d \ $RPM_BUILD_ROOT/{initrd,selinux,run,sys} \ - $RPM_BUILD_ROOT/etc/{NetworkManager/dispatcher.d,X11/xinit/{xinput,xinitrc}.d,certs,cron.d,default,init,logrotate.d,modprobe.d,modules-load.d,pki/{CA,tls},security,sysconfig,tmpwatch,xdg/{autostart,menus}} \ + $RPM_BUILD_ROOT/etc/{NetworkManager/dispatcher.d,X11/xinit/{xinput,xinitrc}.d,certs,cron.d,default,init,logrotate.d,fonts/conf.d,modprobe.d,pki/{CA,tls},security,skel,sysconfig,tmpwatch,xdg/{autostart,menus}} \ $RPM_BUILD_ROOT/home/{users,services} \ - $RPM_BUILD_ROOT/lib/{firmware,security,udev/rules.d} \ + $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,tmpfiles.d} \ - $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,cmake/Modules,color/icc,gnome/help,mate/help,man/man{n,l},man/pl/mann,ppd,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xsessions} \ + $RPM_BUILD_ROOT/usr/share/{appdata,augeas/lenses/tests,backgrounds,cmake/Modules,color/icc,fontconfig/conf.avail,gnome/help,mate/help,man/man{n,l},man/pl/mann,ppd,pkgconfig,soundfonts,sounds,themes/Default,thumbnailers,vala/vapi,wallpapers,wayland-sessions,xsessions} \ $RPM_BUILD_ROOT/usr/src/examples \ $RPM_BUILD_ROOT/var/lib/color/icc \ $RPM_BUILD_ROOT/var/lock/subsys \ @@ -70,13 +71,13 @@ install -d \ $RPM_BUILD_ROOT{%{_aclocaldir},%{_desktopdir}/{docklets,screensavers},%{_iconsdir},%{_pixmapsdir}} \ $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 \ + $RPM_BUILD_ROOT/boot/efi/EFI \ $RPM_BUILD_ROOT/etc/OpenCL/vendors > %{name}.lang install -d $RPM_BUILD_ROOT/usr/share/help/C -for lang in ar as ast bg bn_IN ca cs da de el en_GB es eu fa fi fr gl gu he hi hr hu id it ja ko kn lt lv mk ml mr nb nds nl oc pa pl ps pt pt_BR ro ru sl sr sr@latin sv ta te th tr uk vi zh_CN zh_HK zh_TW; do +for lang in ar as ast bg bn_IN ca cs da de el en_GB es eu fa fi fr gl gu he hi hr hu id it ja ko kn lt lv mk ml mr nb nds nl oc pa pl ps pt pt_BR ro ru sk sl sr sr@latin sv ta te th tr uk vi zh_CN zh_HK zh_TW; do install -d $RPM_BUILD_ROOT/usr/share/help/${lang} echo "%%lang($lang) %dir /usr/share/help/${lang}" >> %{name}.lang done @@ -143,6 +144,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %files -f %{name}.lang %defattr(644,root,root,755) %dir /boot/efi +%dir /boot/efi/EFI %dir /etc/X11/xinit %dir /etc/X11/xinit/xinitrc.d %dir /etc/X11/xinit/xinput.d @@ -152,6 +154,8 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /etc/cron.d %dir /etc/default %dir /etc/init +%dir /etc/fonts +%dir /etc/fonts/conf.d %dir /etc/logrotate.d %dir /etc/modprobe.d %dir /etc/modules-load.d @@ -159,6 +163,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /etc/pki/CA %dir /etc/pki/tls %attr(751,root,root) %dir /etc/security +%dir /etc/skel %dir /etc/sysconfig %dir /etc/tmpwatch %dir /etc/xdg @@ -171,9 +176,12 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /initrd %dir /lib/firmware %dir /lib/security +# for library packages or other software with optional udev support not to pull udev %dir /lib/udev +%dir /lib/udev/hwdb.d %dir /lib/udev/rules.d -%dir /run +# tmpfs mounted by rc-scripts +%attr(1777,root,root) %dir /run %dir /selinux %dir /sys %dir /usr/include/X11 @@ -198,6 +206,8 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /usr/share/cmake/Modules %dir /usr/share/color %dir /usr/share/color/icc +%dir /usr/share/fontconfig +%dir /usr/share/fontconfig/conf.avail %dir /usr/share/gnome %dir /usr/share/gnome/help %dir /usr/share/mate -- 2.46.0