Author: glen Date: Tue Dec 27 23:04:54 2011 GMT Module: packages Tag: HEAD ---- Log message: - use repackaged official tarball
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.165 packages/chromium-browser/chromium-browser.spec:1.166 --- packages/chromium-browser/chromium-browser.spec:1.165 Tue Dec 20 20:38:29 2011 +++ packages/chromium-browser/chromium-browser.spec Wed Dec 28 00:04:49 2011 @@ -47,25 +47,22 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate %{nil} -%define svnver 113337 -%define rel 2 - %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser Version: 16.0.912.63 -Release: 0.%{svnver}.%{rel} +Release: 1 License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking -Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}_%{version}~r%{svnver}.orig.tar.gz -# Source0-md5: c01869f276a9bf5f651771d93b07dac8 +Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.xz +# Source0-md5: f9e8eb4ddf23640aa6cfbe797d750055 #SourceX: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz Source2: %{name}.sh Source3: %{name}.desktop Source5: find-lang.sh Source6: update-source.sh Source7: clean-source.sh +Source8: get-source.sh Patch0: system-libs.patch Patch1: plugin-searchdirs.patch Patch2: gyp-system-minizip.patch @@ -127,6 +124,7 @@ BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXt-devel BuildRequires: xorg-lib-libXtst-devel +BuildRequires: xz %{?with_system_yasm:BuildRequires: yasm} %{?with_system_zlib:BuildRequires: zlib-devel} Requires: browser-plugins >= 2.0 @@ -147,11 +145,6 @@ %define _enable_debug_packages 0 %endif -# undefine if empty, makes prep simplier -%if "%{svndate}" == "%{nil}" -%undefine svndate -%endif - %description Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the @@ -179,10 +172,7 @@ zh-TW %prep -%setup -q -n %{name}-%{version}~%{?svndate:svn%{svndate}}r%{svnver} -SRC=%{name}-%{version}~%{?svndate:svn%{svndate}}r%{svnver}-source.tar.* -tar xf $SRC -%{__rm} $SRC +%setup -q # Google's versioning is interesting. They never reset "BUILD", which is how we jumped # from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch @@ -193,10 +183,10 @@ gyp_rev=$(grep googlecode_url.*gyp src/DEPS | cut -d'"' -f6 | cut -d@ -f2) test "$gyp_rev" = %{gyp_rev} || : -v8_ver=$(awk 'NR=1 {print $NF; exit}' src/v8/ChangeLog) +v8_ver=$(awk 'NR=1 {print $NF; exit}' src/v8/ChangeLog || :) # Populate the LASTCHANGE file template as we no longer have the VCS files at this point -echo "%{svnver}" > src/build/LASTCHANGE.in +#echo "%{svnver}" > src/build/LASTCHANGE.in # add chromium and pld to useragent %define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/') @@ -379,6 +369,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.166 2011/12/27 23:04:49 glen +- use repackaged official tarball + Revision 1.165 2011/12/20 19:38:29 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.165&r2=1.166&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
