Rel 20; update branch diff

diff --git a/branch.sh b/branch.sh
index 961118f0bcb55303b8868d36d49b89d5a58e1b98..80b01b0dcb61312e4c77e3f27321f8e168b17ddc 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -10,6 +10,7 @@ repo=$package.git
 # use filterdiff, etc to exclude bad chunks from diff
 filter() {
     filterdiff \
+        -x '*/Readme.pod' \
         -x '*/test/*' \
         -x '*/doc/*' \
         -x '*/release-process/*'

diff --git a/exim.spec b/exim.spec
index 311e91c518c6473a0cf786383a2ba31b7844ddb7..d33891e9a0aad79aa7f254d2f619256d617d21f4 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8):    Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
 Version:       4.96
-Release:       19
+Release:       20
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons/SMTP
@@ -49,7 +49,7 @@ Source15:     %{name}4-smtp.pamd
 Source16:      %{name}on.png
 # sh branch.sh
 Patch100:      %{name}-git.patch
-# Patch100-md5:        5a14264e62849ba9177f31d7d6c6ba67
+# Patch100-md5:        72805b7d89d44adfe464df7984c6cc66
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch