- restored /etc/modules-load.d from removed systemd, killed other

[packages/filesystem.git] / filesystem.spec

diff --git a/filesystem.spec b/filesystem.spec
index 3f4ed4038d1bd0ea85f90551b2bf30f2fb84a656..bdd3500337e58be1ac2ec8da41f44106229eba91 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:       34
+Release:       36
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -22,15 +22,6 @@ Provides:    browser-plugins(%{_target_base_arch})
 %ifarch %{x8664}
 Provides:      browser-plugins(i386)
 %endif
-%ifarch ppc64
-Provides:      browser-plugins(ppc)
-%endif
-%ifarch s390x
-Provides:      browser-plugins(s390)
-%endif
-%ifarch sparc64
-Provides:      browser-plugins(sparc)
-%endif
 Provides:      filesystem-debuginfo = %{version}-%{release}
 Obsoletes:     filesystem-debuginfo < 3.0-36
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,14 +33,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %else
 %define                with_lib64      0
 %endif
-%if "%{_lib}" == "libx32"
-%define                with_libx32     1
-%else
-%ifarch %{x8664}
-# x32 as additional ABI
-%define                with_libx32     1
-%endif
-%endif
 
 # directory for "privilege separation" chroot
 %define                _privsepdir     /usr/share/empty
@@ -76,9 +59,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} \
@@ -106,25 +89,6 @@ install -d \
        $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"
-rmdir $RPM_BUILD_ROOT/usr/include/X11
-# X11
-install -d $RPM_BUILD_ROOT/usr/X11R6/share
-for manp in man{1,2,3,4,5,6,7,8} ; do
-       install -d $RPM_BUILD_ROOT/usr/X11R6/man/$manp
-       for mloc in it ko pl; do
-               install -d $RPM_BUILD_ROOT/usr/X11R6/man/$mloc/$manp
-       done
-done
-install -d $RPM_BUILD_ROOT/usr/share/wm-properties
-%endif
 
 install -d \
        $RPM_BUILD_ROOT/usr/lib/debug/%{_lib} \
@@ -158,7 +122,6 @@ check_filesystem_dirs() {
 
 check_filesystem_dirs
 
-%if "%{pld_release}" != "ac"
 %pretrans -p <lua>
 -- this needs to be a dir
 if posix.stat("/usr/include/X11", "type") == "link" then
@@ -174,7 +137,6 @@ if posix.stat("/usr/include/X11", "type") == "link" then
        end
        posix.chdir(oldpwd)
 end
-%endif
 
 %post -p <lua>
 posix.chown("/var/log/archive", 0, %{gid_logs})
@@ -194,6 +156,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
@@ -210,16 +173,12 @@ 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
 %dir /selinux
 %dir /sys
-%if "%{pld_release}" != "ac"
 %dir /usr/include/X11
-%endif
 %dir /usr/include/security
 %dir /usr/lib/ConsoleKit
 %dir /usr/lib/ConsoleKit/run-session.d
@@ -296,18 +255,6 @@ posix.chown("/etc/cron.d", 0, %{gid_crontab})
 %dir /usr/libx32/pkgconfig
 %endif
 
-%if "%{pld_release}" == "ac"
-%dir /usr/X11R6
-%dir /usr/X11R6/man
-/usr/X11R6/man/man*
-%lang(it) /usr/X11R6/man/it
-%lang(ko) /usr/X11R6/man/ko
-%lang(pl) /usr/X11R6/man/pl
-%dir /usr/X11R6/share
-
-%dir /usr/share/wm-properties
-%endif
-
 # debuginfo
 %dir /usr/lib/debug
 /usr/lib/debug/*