Author: glen Date: Sun Sep 20 13:36:03 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- move code run to build not prep
- BR libicu-devel
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.6
packages/chromium-browser/chromium-browser.spec:1.7
--- packages/chromium-browser/chromium-browser.spec:1.6 Sun Sep 20 14:56:27 2009
+++ packages/chromium-browser/chromium-browser.spec Sun Sep 20 15:35:58 2009
@@ -36,7 +36,6 @@
# We don't actually use this in the build, but it is included so you can make
the tarball.
Source4: chromium-daily-tarball.sh
BuildRequires: GConf2-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: alsa-lib-devel
BuildRequires: atk-devel
BuildRequires: bison
@@ -48,8 +47,10 @@
BuildRequires: gperf
BuildRequires: gtk+2-devel
BuildRequires: libevent-devel
+BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libstdc++-devel
BuildRequires: libxslt-devel
BuildRequires: minizip-devel
@@ -95,9 +96,11 @@
s|'-O0',|'%{rpmcxxflags}'.split(' ')|g
"
+%build
+cd src/build
+
# Regenerate the scons files
# Also, set the sandbox paths correctly.
-cd src/build
./gyp_chromium all.gyp \
-D linux_sandbox_path=%{_libdir}/%{name}/chrome-sandbox \
-D linux_sandbox_chrome_path=%{_libdir}/%{name}/chromium-browser \
@@ -112,10 +115,7 @@
-Dselinux=1 \
%endif
-Djavascript_engine=v8
-cd -
-%build
-cd src/build
# If we're building sandbox without SELINUX, add "chrome_sandbox" here.
%if %{with selinux}
../../depot_tools/hammer --mode=Release chrome
@@ -125,19 +125,17 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/
+install -d
$RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_pixmapsdir},%{_desktopdir}}
+
cd src/sconsbuild/Release
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/chromium-browser
cp -a chrome.pak locales resources themes $RPM_BUILD_ROOT%{_libdir}/%{name}
cp -a chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chromium-browser
cp -a chrome_sandbox $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome-sandbox
cd -
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
cp -a src/chrome/app/theme/chromium/product_logo_48.png
$RPM_BUILD_ROOT%{_pixmapsdir}/chromium-browser.png
-install -d $RPM_BUILD_ROOT%{_desktopdir}
desktop-file-install --dir $RPM_BUILD_ROOT%{_desktopdir} %{SOURCE3}
%clean
@@ -155,7 +153,7 @@
%{_libdir}/%{name}/resources
%{_libdir}/%{name}/themes
# These unique permissions are intentional and necessary for the sandboxing
-%attr(4555, root, root) %{_libdir}/%{name}/chrome-sandbox
+%attr(4555,root,root) %{_libdir}/%{name}/chrome-sandbox
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -163,6 +161,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2009/09/20 13:35:58 glen
+- move code run to build not prep
+- BR libicu-devel
+
Revision 1.6 2009/09/20 12:56:27 arekm
- md5sum; x86_64 is supported but there can be problems (fc instead just
disabled it)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
