commit b6c0552a0616847fe6fc9cc79bdc1ae96fc9409a
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jul 2 00:37:05 2015 +0300
cleanup svnrev
google distributes "rel 1" packages since chrome 30 already.
see ea01ae47
google-chrome.spec | 10 ++++------
update-source.sh | 18 +++++++++---------
2 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/google-chrome.spec b/google-chrome.spec
index 128424d..0fd12d4 100644
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -4,9 +4,7 @@
# Conditional build:
%bcond_without ffmpegsumo # using ffmpegsumo
-%define svnrev 1
%define flashv 18.0.0.194
-#define rel %{nil}
%define state stable
%if "%{state}" == "beta" || "%{state}" == "unstable"
%define gcsuffix -%{state}
@@ -14,13 +12,13 @@
Summary: Google Chrome
Name: google-chrome
Version: 43.0.2357.130
-Release: %{svnrev}%{?rel:.%{rel}}
+Release: 1
License: Multiple, see http://chrome.google.com/
Group: Applications/Networking
-Source0:
http://dl.google.com/linux/chrome/rpm/stable/i386/%{name}-%{state}-%{version}-%{svnrev}.i386.rpm
+Source0:
http://dl.google.com/linux/chrome/rpm/stable/i386/%{name}-%{state}-%{version}-%{release}.i386.rpm
# NoSource0-md5: 2c0618d02f1dbaa88a54e54afb5877e4
NoSource: 0
-Source1:
http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{svnrev}.x86_64.rpm
+Source1:
http://dl.google.com/linux/chrome/rpm/stable/x86_64/%{name}-%{state}-%{version}-%{release}.x86_64.rpm
# NoSource1-md5: 45e49393874e6d4ccfa00b5abe9d46db
NoSource: 1
Source2: %{name}.sh
@@ -114,7 +112,7 @@ SOURCE=%{S:1}
V=$(rpm -qp --nodigest --nosignature --qf '%{V}' $SOURCE)
R=$(rpm -qp --nodigest --nosignature --qf '%{R}' $SOURCE)
-if [ version:$V != version:%{crver} -o svnrev:$R != svnrev:%{svnrev} ]; then
+if [ version:$V != version:%{crver} -o release:$R != release:%{release} ]; then
exit 1
fi
rpm2cpio $SOURCE | cpio -i -d
diff --git a/update-source.sh b/update-source.sh
index 876a0c8..93b6633 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -49,18 +49,18 @@ perl -ne 'm{<name>google-'$product-$branch'</name>} and
m{<version epoch="0" ver
set -- $(sed -re "s,^.+-([^-]+)-([^-]+).$arch$,\1 \2," $t)
ver=$1
-rev=$2
+rel=$2
# check google-chrome ver only
-oldrev=$(awk '/^%define[ ]+svnrev[ ]+/{print $NF}' $specfile)
oldver=$(awk '/^Version:[ \t]+/{print $NF; exit}' $specfile)
-if [ "$oldrev" = "$rev" -a "$oldver" = "$ver" ]; then
- echo "Already up to date (google-chrome/$ver-$rev)"
+oldrel=$(awk '/^Release:[ \t]+/{print $NF; exit}' $specfile)
+if [ "$oldrel" = "$rel" -a "$oldver" = "$ver" ]; then
+ echo "Already up to date (google-chrome/$ver-$rel)"
exit 0
fi
# extract flash version
-rpm=$name-$branch-$ver-$rev.$arch.rpm
+rpm=$name-$branch-$ver-$rel.$arch.rpm
manifest=manifest-$ver.json
test -e $rpm || wget -c $sourceurl/$rpm
test -e $manifest || {
@@ -77,17 +77,17 @@ rm -f "$t" "$manifest"
# check google-chrome and flash ver
oldflash=$(awk '/^%define[ ]+flashv[ ]+/{print $NF}' $specfile)
-if [ "$oldrev" = "$rev" -a "$oldver" = "$ver" -a "$oldflash" = "$flashv" ];
then
- echo "Already up to date (google-chrome/$ver-$rev flash/$flashv)"
+if [ "$oldrel" = "$rel" -a "$oldver" = "$ver" -a "$oldflash" = "$flashv" ];
then
+ echo "Already up to date (google-chrome/$ver-$rel flash/$flashv)"
exit 0
fi
-echo "Updating $specfile for google-chrome/$oldver-$oldrev -> $ver-$rev,
flash/$oldflash -> $flashv"
+echo "Updating $specfile for google-chrome/$oldver-$oldrel -> $ver-$rel,
flash/$oldflash -> $flashv"
sed -i -e "
- s/^\(%define[ \t]\+svnrev[ \t]\+\)[0-9]\+\$/\1$rev/
s/^\(%define[ \t]\+state[ \t]\+\)[a-z]\+\$/\1$branch/
s/^\(%define[ \t]\+flashv[ \t]\+\)[0-9.]\+\$/\1$flashv/
s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$ver/
+ s/^\(Release:[ \t]\+\)[.0-9]\+\$/\1$rel/
" $specfile
../builder -ncs -nd -n5 -g $specfile || :
../builder -ncs -nd -5 $specfile
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/google-chrome.git/commitdiff/b6c0552a0616847fe6fc9cc79bdc1ae96fc9409a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
