- support 32-bit browsers on archs with lib64

Changed files:
    filesystem.spec -> 1.76

diff --git a/filesystem.spec b/filesystem.spec
index 749e6f27ac6b38ca3948f56a9644b1c8729b0f25..d053beb1ab0528566ee012fd16d19b812266b057 100644 (file)
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -11,6 +11,18 @@ Group:               Base
 BuildRequires: automake
 Requires:      FHS >= 2.3-15
 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # directory for "privilege separation" chroot
@@ -50,7 +62,7 @@ install -d \
        $RPM_BUILD_ROOT/home/{users,services} \
        $RPM_BUILD_ROOT/lib/{firmware,security} \
        $RPM_BUILD_ROOT/usr/include/security \
-       $RPM_BUILD_ROOT/usr/lib/{cgi-bin,debug,pkgconfig} \
+       $RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,debug,pkgconfig} \
        $RPM_BUILD_ROOT/usr/share/{gnome/help,man/man{n,l},man/pl/mann,pkgconfig,sounds,themes/Default,wallpapers,wm-properties,xsessions} \
        $RPM_BUILD_ROOT/usr/src/{debug,examples} \
        $RPM_BUILD_ROOT/var/lock/subsys \
@@ -58,13 +70,11 @@ install -d \
        $RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
        $RPM_BUILD_ROOT{%{_idldir},%{_privsepdir}}
 
-install -d \
 %if "%{_lib}" == "lib64"
+install -d \
        $RPM_BUILD_ROOT/lib64/security \
        $RPM_BUILD_ROOT/usr/lib64/pkgconfig \
        $RPM_BUILD_ROOT/usr/lib64/browser-plugins
-%else
-       $RPM_BUILD_ROOT/usr/lib/browser-plugins
 %endif
 
 %clean
@@ -101,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /selinux
 %dir /sys
 %dir /usr/include/security
+%dir /usr/lib/browser-plugins
 %dir /usr/lib/cgi-bin
 %dir /usr/lib/pkgconfig
 %dir /usr/share/gnome
@@ -128,8 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib64/security
 %dir /usr/lib64/pkgconfig
 %dir /usr/lib64/browser-plugins
-%else
-%dir /usr/lib/browser-plugins
 %endif
 
 %files debuginfo