up to 2.24 (git 7dc2f25)

diff --git a/crossnacl-binutils.spec b/crossnacl-binutils.spec
index bb0bbf87a7eb48e69995d994d147b9d98d323148..abc6539535617a2f15ea008c70cf63c851744a27 100644 (file)
--- a/crossnacl-binutils.spec
+++ b/crossnacl-binutils.spec
@@ -1,14 +1,15 @@
-%define                gitver bd55408
+%define                rel             1
+%define                gitver  7dc2f25
 Summary:       Cross NaCL GNU binary utility development utilities - binutils
 Name:          crossnacl-binutils
-Version:       2.20.1
-Release:       4.git%{gitver}.1
+Version:       2.24
+Release:       0.git%{gitver}.%{rel}
 License:       GPL
 Group:         Development/Tools
 Source0:       nacl-binutils-%{version}-git%{gitver}.tar.xz
-# Source0-md5: 6970752492880c59be545c39f433edeb
+# Source0-md5: 62c1372814f7873be066fe316fbe1c9c
 Source1:       get-source.sh
-URL:           http://git.chromium.org/gitweb/?p=native_client/nacl-binutils.git
+URL:           https://chromium.googlesource.com/native_client/nacl-binutils/
 BuildRequires: bash
 BuildRequires: bison
 BuildRequires: flex
@@ -97,11 +98,8 @@ findup -m $RPM_BUILD_ROOT
 # however, this should be done in Makefiles.
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{*dlltool,*nlmconv,*windres}.1
 
-# don't want this here
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
-
 # packaged in base binutils
-%{__rm} -r $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rv $RPM_BUILD_ROOT%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/get-source.sh b/get-source.sh
index 66ea7abed3eaf95c4283d6591d2ddd3c181b9c8b..192d9a1e0e39cfa310de71d80092e7cd36175054 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -14,7 +14,7 @@ set -e
 # tar cfj nacl-binutils-2.20.1-git73acd6f.tar.bz2 nacl-binutils-2.20.1-git73acd6f
 
 package=nacl-binutils
-repo_url=http://git.chromium.org/native_client/$package.git
+repo_url=https://chromium.googlesource.com/native_client/$package
 nacl_trunk=http://src.chromium.org/native_client/trunk
 omahaproxy_url=http://omahaproxy.appspot.com
 specfile=crossnacl-binutils.spec
@@ -52,7 +52,7 @@ fi
 
 githash=$NACL_BINUTILS_COMMIT
 git show $githash:bfd/configure.in > configure.in
-version=$(awk '/AM_INIT_AUTOMAKE/{v=$NF; sub(/\)/, "",v);print v}' configure.in)
+version=$(awk '/AC_INIT/{v=$2; gsub(/[\[\])]*/, "",v);print v}' configure.in)
 shorthash=$(git rev-parse --short $githash)
 prefix=$package-$version-git$shorthash
 archive=$prefix.tar.xz