[packages/gcc] - rel 6; fixes branch diff patch; fix in branch.sh

[arekm]

commit 5b6156b942826b40aae00c538e4c819ccf7c33ab
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jan 15 09:23:50 2018 +0100

    - rel 6; fixes branch diff patch; fix in branch.sh

 branch.sh | 4 +++-
 gcc.spec  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index 6512115..df78f42 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -105,7 +105,7 @@ Summary(pl.UTF-8):	Kolekcja kompilatorów GNU: kompilator C i pliki współdziel
 Summary(pt_BR.UTF-8):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		gcc
 Version:	%{major_ver}.%{minor_ver}
-Release:	5
+Release:	6
 Epoch:		6
 License:	GPL v3+
 Group:		Development/Languages
@@ -117,7 +117,7 @@ Source3:	libffi.pc.in
 Source4:	branch.sh
 # use branch.sh to update glibc-branch.diff
 Patch100:	%{name}-branch.diff
-# Patch100-md5:	4a58511a43a1387d3f2e004ff67d6fb6
+# Patch100-md5:	5e61603c46bcf0986d005cf6b7b53bf3
 # https://github.com/hjl-tools/gcc.git
 # git log -p --reverse origin/gcc-7-branch..hjl/indirect/gcc-7-branch/master > ~/rpm/packages/gcc/gcc-retpoline.patch
 Patch101:	%{name}-retpoline.patch
diff --git a/branch.sh b/branch.sh
index 83ff9ac..9d1d6a1 100755
--- a/branch.sh
+++ b/branch.sh
@@ -9,7 +9,9 @@ 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,'
+	# replace svn nonexistend with '0' date, so patch will know that file needs to be removed from disk
+	sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' | \
+	sed -e 's,^\([-+]\{3\} .*\t\)(nonexistent)$,\11970-01-01 01:00:00.000000000 +0100,'
 }
 
 old=$svn/$tag
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/5b6156b942826b40aae00c538e4c819ccf7c33ab