X-Git-Url: https://git.tld-linux.org/?p=packages%2Ffilesystem.git;a=blobdiff_plain;f=filesystem.spec;h=ae38171c34f6afffb7ca2ece74921b699ddd6e91;hp=ef649ed6ab38c5d1106b2a8e4a22026f6f46edb8;hb=8c53b8f00d53f6ca70f51d28d190824ca526c633;hpb=ec38a642208ba243ee18db26d0cf9a13a1f104d8

diff --git a/filesystem.spec b/filesystem.spec
index ef649ed..ae38171 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:	35
+Release:	42
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -30,8 +31,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{_lib}" == "lib64"
 %define		with_lib64	1
-%else
-%define		with_lib64	0
 %endif
 
 # directory for "privilege separation" chroot
@@ -59,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,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,modules-load.d,pki/{CA,tls},security,skel,sysconfig,sysctl.d,tmpwatch,xdg/{autostart,menus}} \
 	$RPM_BUILD_ROOT/home/{users,services} \
-	$RPM_BUILD_ROOT/lib/{firmware,security,udev/rules.d,systemd/system} \
+	$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 \
@@ -72,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
@@ -145,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
@@ -154,13 +154,18 @@ 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
 %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
@@ -172,11 +177,12 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /initrd
 %dir /lib/firmware
 %dir /lib/security
-%dir /lib/systemd
-%dir /lib/systemd/system
+# 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
@@ -201,6 +207,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