Author: glen Date: Wed Jan 10 13:34:34 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- support 32-bit browsers on archs with lib64
- rel 4
---- Files affected:
SPECS:
filesystem.spec (1.71.2.6 -> 1.71.2.7)
---- Diffs:
================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.71.2.6 SPECS/filesystem.spec:1.71.2.7
--- SPECS/filesystem.spec:1.71.2.6 Sat Dec 23 12:12:51 2006
+++ SPECS/filesystem.spec Wed Jan 10 14:34:29 2007
@@ -3,12 +3,24 @@
Summary(pl): Wspólne katalogi
Name: filesystem
Version: 2.0
-Release: 3
+Release: 4
License: GPL
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
@@ -36,7 +48,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,pkgconfig} \
+ $RPM_BUILD_ROOT/usr/lib/{cgi-bin,browser-plugins,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/examples \
$RPM_BUILD_ROOT/var/lock/subsys \
@@ -44,13 +56,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
# X11
@@ -95,6 +105,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
@@ -122,8 +133,6 @@
%dir /lib64/security
%dir /usr/lib64/pkgconfig
%dir /usr/lib64/browser-plugins
-%else
-%dir /usr/lib/browser-plugins
%endif
%dir /usr/X11R6
@@ -140,6 +149,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.71.2.7 2007/01/10 13:34:29 glen
+- support 32-bit browsers on archs with lib64
+- rel 4
+
Revision 1.71.2.6 2006/12/23 11:12:51 glen
- typo; rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/filesystem.spec?r1=1.71.2.6&r2=1.71.2.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
