SPECS: filesystem.spec - support 32-bit browsers on archs with lib64

[qboosh]

Author: qboosh                       Date: Tue Dec 26 20:17:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- support 32-bit browsers on archs with lib64

---- Files affected:
SPECS:
   filesystem.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.75 SPECS/filesystem.spec:1.76
--- SPECS/filesystem.spec:1.75	Sat Dec 23 12:13:14 2006
+++ SPECS/filesystem.spec	Tue Dec 26 21:17:04 2006
@@ -12,6 +12,18 @@
 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
@@ -51,7 +63,7 @@
 	$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 \
@@ -59,13 +71,11 @@
 	$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
@@ -102,6 +112,7 @@
 %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
@@ -129,8 +140,6 @@
 %dir /lib64/security
 %dir /usr/lib64/pkgconfig
 %dir /usr/lib64/browser-plugins
-%else
-%dir /usr/lib/browser-plugins
 %endif
 
 %files debuginfo
@@ -144,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2006/12/26 20:17:04  qboosh
+- support 32-bit browsers on archs with lib64
+
 Revision 1.75  2006/12/23 11:13:14  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/filesystem.spec?r1=1.75&r2=1.76&f=u