X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=filesystem.spec;h=3d7201f10f3d91a9b0e44e00c2f5b44aecb09bb2;hb=3fbd6eaf34f614f94ea86931ecdada12d14298b0;hp=e02111de3e3c77cf456c3dc62ce77be6c42c6c91;hpb=373ae7c6375b8baf2dc574a57c1364374bb0fd61;p=packages%2Ffilesystem.git diff --git a/filesystem.spec b/filesystem.spec index e02111d..3d7201f 100644 --- a/filesystem.spec +++ b/filesystem.spec @@ -11,7 +11,7 @@ Summary: Common directories Summary(pl.UTF-8): Wspólne katalogi Name: filesystem Version: 4.0 -Release: 32 +Release: 41 License: GPL Group: Base BuildRequires: automake @@ -37,6 +37,19 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # Adapter: This file does not like to be adapterized! +%if "%{_lib}" == "lib64" +%define with_lib64 1 +%endif +%if "%{_lib}" == "libx32" +%define with_libx32 1 +%define with_lib64 1 +%else +%ifarch %{x8664} +# x32 as additional ABI +%define with_libx32 1 +%endif +%endif + # directory for "privilege separation" chroot %define _privsepdir /usr/share/empty # directory for *.idl files (for CORBA implementations) @@ -62,12 +75,12 @@ rm -rf $RPM_BUILD_ROOT install -d \ $RPM_BUILD_ROOT/{initrd,selinux,run,sys} \ - $RPM_BUILD_ROOT/etc/{NetworkManager/dispatcher.d,X11/xinit/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,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,systemd/system} \ $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,factory/etc/pam.d,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 \ @@ -75,21 +88,28 @@ 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 -%if "%{_lib}" == "lib64" +%if %{with lib64} install -d \ $RPM_BUILD_ROOT/lib64/security \ - $RPM_BUILD_ROOT/usr/lib64/{browser-plugins,cmake,initrd,mozilla/extensions,pkcs11,pkgconfig} + $RPM_BUILD_ROOT/usr/lib64/{browser-plugins,cmake,initrd,mozilla/extensions,pkcs11,pkgconfig} \ + $RPM_BUILD_ROOT/usr/lib/debug/lib64/security +%endif +%if %{with libx32} +install -d \ + $RPM_BUILD_ROOT/libx32/security \ + $RPM_BUILD_ROOT/usr/libx32/{browser-plugins,cmake,initrd,mozilla/extensions,pkcs11,pkgconfig} \ + $RPM_BUILD_ROOT/usr/lib/debug/libx32/security %endif %if "%{pld_release}" == "ac" @@ -113,11 +133,6 @@ install -d \ $RPM_BUILD_ROOT/usr/lib/debug/lib/security \ $RPM_BUILD_ROOT/usr/src/debug -%if "%{_lib}" == "lib64" -install -d \ - $RPM_BUILD_ROOT/usr/lib/debug/lib64/security -%endif - # create this for %clean tar -cf checkfiles.tar -C $RPM_BUILD_ROOT . @@ -132,7 +147,7 @@ check_filesystem_dirs() { TMPFILE=$(mktemp) # note: we must exclude from check all existing dirs belonging to FHS find | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort | grep -v $TMPFILE | \ - grep -E -v '^/(boot|etc|etc/X11|home|lib|lib64|usr|usr/include|usr/lib|usr/lib64|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/man|usr/share/man/pl|usr/src|var|var/lib|var/lock|var/log)$' > $TMPFILE # find finds also '.', so use option -B for diff rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB - $TMPFILE || : @@ -167,20 +182,25 @@ 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 %dir /etc/OpenCL %dir /etc/OpenCL/vendors %attr(751,root,root) %dir /etc/certs %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/pki %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 @@ -224,6 +244,11 @@ 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/factory +%dir /usr/share/factory/etc +%dir /usr/share/factory/etc/pam.d +%dir /usr/share/fontconfig +%dir /usr/share/fontconfig/conf.avail %dir /usr/share/gnome %dir /usr/share/gnome/help %dir /usr/share/mate @@ -258,7 +283,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %{_fontsdir} %dir %{_idldir} %dir %{_privsepdir} -%if "%{_lib}" == "lib64" +%if %{with lib64} %dir /lib64/security %dir /usr/lib64/browser-plugins %dir /usr/lib64/cmake @@ -268,6 +293,16 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab}) %dir /usr/lib64/pkcs11 %dir /usr/lib64/pkgconfig %endif +%if %{with libx32} +%dir /libx32/security +%dir /usr/libx32/browser-plugins +%dir /usr/libx32/cmake +%dir /usr/libx32/initrd +%dir /usr/libx32/mozilla +%dir /usr/libx32/mozilla/extensions +%dir /usr/libx32/pkcs11 +%dir /usr/libx32/pkgconfig +%endif %if "%{pld_release}" == "ac" %dir /usr/X11R6