sync clean source script

[packages/chromium-browser.git] / update-source.sh

diff --git a/update-source.sh b/update-source.sh
index ebed5c0411d1c46c2a9ecb8c48cedbcb88be1a57..2924824e789762ac1a73de83a486360af12dfc72 100755 (executable)
--- a/update-source.sh
+++ b/update-source.sh
@@ -18,7 +18,7 @@ cd "$dir"
 dir=$(pwd)
 
 # extract version components from url
-# exports: $version; $release; $svndate; $svnver
+# exports: $version; $release; $svndate; $svnver; $branch; $basever
 extract_version() {
        local url=$1 part
 
@@ -27,7 +27,9 @@ extract_version() {
                # ubuntu urls
                version=${part%~*}; part=${part#*${version}~}
        else
-               version=${part%.tar.*}; part=${part#*${version}.tar.*}
+               version=${part%.tar.*}; part=${part#*${version}}
+               part=${part#.tar.xz}
+               part=${part#.tar.gz}
        fi
 
        # release always 1 :)
@@ -40,7 +42,10 @@ extract_version() {
        fi
        svnver=${part#r}; svnver=${svnver%%.*}
 
-       : version=$version release=$release svnver=$svnver
+       branch=${version%.*}
+       basever=${version#${branch}.}
+
+       : EXTRACTED: version=$version release=$release svnver=$svnver branch=$branch basever=$basever
 }
 
 url2version() {
@@ -61,6 +66,8 @@ version2url() {
        echo "${url}" | sed -e "
                s,%{version},$version,g
                s,%{release},$release,g
+               s,%{basever},$basever,g
+               s,%{branch},$branch,g
                s,%{svndate},$svndate,g
                s,%{svnver},$svnver,g
        "
@@ -114,7 +121,9 @@ url_tpl=$(url2version $tarball)
 
 svndate=$(awk '/^%define[      ]+svndate[      ]+/{print $NF}' $specfile)
 svnver=$(awk '/^%define[       ]+svnver[       ]+/{print $NF}' $specfile)
-version=$(awk '/^Version:[     ]+/{print $NF}' $specfile)
+branch=$(awk '/^%define[       ]+branch[       ]+/{print $NF}' $specfile)
+basever=$(awk '/^%define[      ]+basever[      ]+/{print $NF}' $specfile)
+version=$(awk '/^Version:[     ]+/{print $NF}' $specfile | tail -n1)
 rel=$(awk '/^%define[  ]+rel[  ]+/{print $NF}' $specfile)
 if [ "$svndate" = "%{nil}" ]; then
        svndate=
@@ -136,6 +145,8 @@ else
        sed -i -e "
                s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/
                s/^\(%define[ \t]\+svndate[ \t]\+\).\+\$/\1$svndate/
+               s/^\(%define[ \t]\+branch[ \t]\+\).\+\$/\1$branch/
+               s/^\(%define[ \t]\+basever[ \t]\+\).\+\$/\1$basever/
                s/^\(%define[ \t]\+rel[ \t]\+\)[0-9]\+\$/\1$release/
                s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
        " $specfile
@@ -150,7 +161,7 @@ fi
 
 dist=$(rpm -E %{pld_release})
 arch=$(rpm -E %{_host_cpu})
-outdir=$(readlink -f $dir)/BUILD-$dist-$arch
+outdir=$(readlink -f $dir)/BUILD/$dist-$arch
 logfile=$outdir/$pkg.log
 rpmdir=$outdir/RPMS
 rpmdest=~/public_html/chromium-browser/$dist/$arch
@@ -166,7 +177,7 @@ fi
 
 command=-bp
 test "$build_package" = 1 && command=-bb
-       rpmbuild $command --clean \
+rpmbuild $command --clean \
        --define "_unpackaged_files_terminate_build 1" \
        --define '_enable_debug_packages 0' \
        --define "_topdir $dir" \