add branch.sh script to create branch diff

diff --git a/branch.sh b/branch.sh
new file mode 100755 (executable)
index 0000000..51254f6
--- /dev/null
+++ b/branch.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+package=gcc
+svn=svn://gcc.gnu.org/svn/$package
+branch=branches/$package-6-branch
+tag=tags/${package}_6_2_0_release
+out=$package-branch.diff
+
+# use filterdiff, etc to exclude bad chunks from diff
+filter() {
+       # remove revno's for smaller diffs
+       sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+}
+
+old=$svn/$tag
+new=$svn/$branch
+echo >&2 "Running diff: $old -> $new"
+LC_ALL=C svn diff -x --ignore-eol-style --force --old=$old --new=$new > $out.svn.tmp
+filter < $out.svn.tmp > $out.tmp
+rm -f $out.svn.tmp
+
+if cmp -s $out{,.tmp}; then
+       echo >&2 "No new diffs..."
+       rm -f $out.tmp
+       exit 0
+fi
+mv -f $out{.tmp,}
+
+../md5 $package.spec
+../dropin $out

diff --git a/gcc.spec b/gcc.spec
index a24a1eca1b594cbde8395c173deecc1638a749ff..475bbaf7d44d437007d3f9a9eb51b343924d21e3 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -137,9 +137,10 @@ Source2:   ftp://sourceware.org/pub/java/ecj-%{major_ecj_ver}.jar
 # Source2-md5: 7339f199ba11c941890031fd9981d7be
 # check libffi version with libffi/configure.ac
 Source3:       libffi.pc.in
-# svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_6_2_0_release svn://gcc.gnu.org/svn/gcc/branches/gcc-6-branch > gcc-branch.diff
+Source4:       branch.sh
+# use branch.sh to update glibc-branch.diff
 Patch100:      %{name}-branch.diff
-# Patch100-md5:        8211f0f6f0a2179e51b4ac42f91bd44d
+# Patch100-md5:        07f029f587c1c07a9cddf7d84ed5b21e
 Patch0:                %{name}-info.patch
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch