- fixed lib64 bug on i686

[packages/filesystem.git] / filesystem.spec

diff --git a/filesystem.spec b/filesystem.spec
index ef649ed6ab38c5d1106b2a8e4a22026f6f46edb8..26a91dca250d486d04483a03d0f51909fa9bd564 100644 (file)
--- 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:       35
+Release:       37
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -30,8 +30,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,9 +57,9 @@ 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,modprobe.d,modules-load.d,pki/{CA,tls},security,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/lib/{firmware,security,udev/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} \
@@ -156,6 +154,7 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /etc/init
 %dir /etc/logrotate.d
 %dir /etc/modprobe.d
+%dir /etc/modules-load.d
 %dir /etc/pki
 %dir /etc/pki/CA
 %dir /etc/pki/tls
@@ -172,8 +171,6 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /initrd
 %dir /lib/firmware
 %dir /lib/security
-%dir /lib/systemd
-%dir /lib/systemd/system
 %dir /lib/udev
 %dir /lib/udev/rules.d
 %dir /run