Rel 7; bug was in 4.96 itself, so restore branch diff (which also includes fix now...

diff --git a/branch.sh b/branch.sh
index 22e9d86bcb618e53bcbf97f5594b59bb47418773..961118f0bcb55303b8868d36d49b89d5a58e1b98 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -11,7 +11,8 @@ repo=$package.git
 filter() {
     filterdiff \
         -x '*/test/*' \
 filter() {
     filterdiff \
         -x '*/test/*' \

-        -x '*/doc/*'
+        -x '*/doc/*' \
+        -x '*/release-process/*'

 }
 
 if [ ! -d $repo ]; then
 }
 
 if [ ! -d $repo ]; then

diff --git a/exim.spec b/exim.spec
index 4eac0683ca3248fdb4dd3c4f9df569eb01926833..a28156dfb06aa46bd96c9b59ec09d4d1ac26b4fb 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
 Summary(pt_BR.UTF-8):  Servidor de correio eletrônico exim
 Name:          exim
 Version:       4.96

-Release:       6
+Release:       7

 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons/SMTP
 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
 Source16:      %{name}on.png
 # sh branch.sh
 Patch100:      %{name}-git.patch

-# Patch100-md5:        393b8bbf42e4e25abc4ce32857ca6e95
+# Patch100-md5:        5024defa802005706d5b9e457004360d

 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-cflags.patch


@@ -174,7 +174,7 @@ Pliki nagłówkowe dla Exima.
 
 %prep
 %setup -q -a1 -a7
 
 %prep
 %setup -q -a1 -a7

-#%patch100 -p2
+%patch100 -p2

 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1