Prevent patch remnants from being included in release tarballs.

	* src-release.sh (do_proto_toplev): Strip patch remnant files from
	the sources before creating the tarball.

diff --git a/ChangeLog b/ChangeLog
index 7db5d822302fb8b87336c50d8e4225e64193fbea..c4cb63785c7e7b53747f6b8cfc1cf1c0bae3c1a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-29  Nick Clifton  <nickc@redhat.com>
+
+       * src-release.sh (do_proto_toplev): Strip patch remnant files from
+       the sources before creating the tarball.
+
 2018-01-13  Nick Clifton  <nickc@redhat.com>
 
        * src-release.sh: Update copyright notice.  Change reference to devo

diff --git a/src-release.sh b/src-release.sh
index f7243970c955ea3b6dbfb300c550b1669d91fd7d..3203a6af2be3cffad541cc689426ce7da6f173b2 100755 (executable)
--- a/src-release.sh
+++ b/src-release.sh
@@ -77,6 +77,11 @@ do_proto_toplev()
     ver=$2
     tool=$3
     support_files=$4
+
+    echo "==> Cleaning sources."
+    find -name "*.orig" -exec rm {} \;
+    find -name "*.rej" -exec rm {} \;
+    
     echo "==> Making $package-$ver/"
     # Take out texinfo from a few places.
     sed -e '/^all\.normal: /s/\all-texinfo //' \