Author: glen Date: Sat Oct 8 19:30:30 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 15.0.874.83 - switched to beta channel - use our own tarball generation (sadly ubuntu ppa not updated anymore)
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.135 -> 1.136) , update-source.sh (1.22 -> 1.23) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.135 packages/chromium-browser/chromium-browser.spec:1.136 --- packages/chromium-browser/chromium-browser.spec:1.135 Tue Sep 20 00:52:34 2011 +++ packages/chromium-browser/chromium-browser.spec Sat Oct 8 21:30:25 2011 @@ -48,19 +48,20 @@ # or: # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf -%define svndate 20110904 -%define svnver 99583 +%define svndate %{nil} +%define svnver 104223 %define rel 1 %define gyp_rev 1014 Summary: A WebKit powered web browser Name: chromium-browser -Version: 15.0.871.0 +Version: 15.0.874.83 Release: 0.%{svnver}.%{rel} License: BSD, LGPL v2+ (ffmpeg) Group: X11/Applications/Networking -Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz -# Source0-md5: 2a3b5e5d632e9b2a93bb7b3b8a0d1db8 +#Source0: http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz +Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}_%{version}~r%{svnver}.orig.tar.gz +# Source0-md5: c9013564af4f1f9dbeb40737830adb9f Source2: %{name}.sh Source3: %{name}.desktop Source4: find-lang.sh @@ -108,12 +109,13 @@ BuildRequires: pkgconfig BuildRequires: pulseaudio-devel BuildRequires: python -BuildRequires: rpm >= 4.4.9-56 -%{?with_system_speex:BuildRequires: speex-devel >= 1:1.2-rc1} #BuildRequires: python-gyp >= 1-%{gyp_rev} BuildRequires: python-modules +BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.453 +%{?with_system_speex:BuildRequires: speex-devel >= 1:1.2-rc1} BuildRequires: sqlite3-devel >= 3.6.1 +BuildRequires: tar >= 1:1.22 BuildRequires: util-linux %{?with_system_v8:BuildRequires: v8-devel} BuildRequires: which @@ -123,12 +125,12 @@ %{?with_system_yasm:BuildRequires: yasm} %{?with_system_zlib:BuildRequires: zlib-devel} Requires: browser-plugins >= 2.0 +Requires: desktop-file-utils Requires: libvpx >= 0.9.5-2 Requires: xdg-utils >= 1.0.2-4 Provides: wwwbrowser Obsoletes: chromium-browser-bookmark_manager < 5.0.388.0 Obsoletes: chromium-browser-inspector < 15.0.863.0 -Requires: desktop-file-utils ExclusiveArch: %{ix86} %{x8664} arm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -138,6 +140,11 @@ %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 @@ -165,9 +172,11 @@ zh-CN, zh-TW %prep -%setup -q -n %{name}-%{version}~svn%{svndate}r%{svnver} -lzma -dc %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma | tar x -rm -f %{name}-%{version}~svn%{svndate}r%{svnver}-source.tar.lzma +# chromium-browser-15.0.874.83~svnr104223 +%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 # 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 @@ -359,6 +368,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.136 2011/10/08 19:30:25 glen +- up to 15.0.874.83 +- switched to beta channel +- use our own tarball generation (sadly ubuntu ppa not updated anymore) + Revision 1.135 2011/09/19 22:52:34 glen - up to 15.0.871.0, r99583; update-desktop-database (specifies MimeType in .desktop) ================================================================ Index: packages/chromium-browser/update-source.sh diff -u packages/chromium-browser/update-source.sh:1.22 packages/chromium-browser/update-source.sh:1.23 --- packages/chromium-browser/update-source.sh:1.22 Fri Mar 4 14:32:14 2011 +++ packages/chromium-browser/update-source.sh Sat Oct 8 21:30:25 2011 @@ -6,6 +6,9 @@ # publish_packages=[0|1] - publish built packages in ~/public_html/$dist/$arch # quiet=[0|1] - discard stdout of process +pkg=chromium-browser +specfile=$pkg.spec + # work in package dir dir=$(dirname "$0") cd "$dir" @@ -20,7 +23,8 @@ exec 1>/dev/null fi -baseurl=http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser +# take baseurl from .spec Source0 +baseurl=$(awk '/^Source0:/{print $2}' $specfile | xargs dirname) if [ "$1" ]; then url=$1 @@ -31,6 +35,13 @@ fi echo "Fetching latest tarball name..." url=$(lynx -dump $baseurl/ | awk '/orig\.tar\.gz/{tarball=$NF} END{print tarball}') + # unescape "~" encoded by lighttpd + url=$(echo "$url" | sed -e 's,%7e,~,gi') +fi + +if [ -z "$url" ]; then + echo >&2 "URL empty..." + exit 1 fi tarball=${url##*/} @@ -45,8 +56,6 @@ upload=$tarball fi -pkg=chromium-browser -specfile=$pkg.spec # cvs up specfile, rename in case of conflicts cvs up $specfile || { set -x; mv -b $specfile $specfile.old && cvs up $specfile; } @@ -55,8 +64,11 @@ svnver=$(awk '/^%define[ ]+svnver[ ]+/{print $NF}' $specfile) version=$(awk '/^Version:[ ]+/{print $NF}' $specfile) rel=$(awk '/^%define[ ]+rel[ ]+/{print $NF}' $specfile) +if [ "$svndate" = "%{nil}" ]; then + svndate= +fi -newtar=${pkg}_${version}~svn${svndate}r${svnver}.orig.tar.gz +newtar=${pkg}_${version}~${svndate:+svn${svndate}}r${svnver}.orig.tar.gz if [ "$newtar" = "$tarball" ]; then echo "$specfile already up to $newtar" @@ -65,10 +77,16 @@ exit 0 fi else - echo "Updating $specfile $to $newtar" - version=${tarball#${pkg}_} version=${version%~*} - svndate=${tarball#*svn} svndate=${svndate%%r*} - svnver=${tarball#${pkg}_${version}~svn${svndate}r} svnver=${svnver%%.*} + echo "Updating $specfile to $tarball" + part=${tarball#${pkg}_} + version=${part%~*} part=${part#*${version}~} + if [ "$part" != "${part%%svn*}" ]; then + svndate=${part#svn*} svndate=${svndate%%r*} + part=${part#svn${svndate}} + else + svndate='%{nil}' + fi + svnver=${part#r} svnver=${svnver%%.*} sed -i -e " s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.135&r2=1.136&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
