Rel 2

diff --git a/rsync-norandomfailure.patch b/rsync-norandomfailure.patch
index d8ac4ea9df42930b747fc45287fee811995a66f4..541bcdba4bfeaa9c4fa0efa97ce156fee9dd0093 100644 (file)
--- a/rsync-norandomfailure.patch
+++ b/rsync-norandomfailure.patch
@@ -1,10 +1,35 @@
---- rsync-3.2.7/Makefile.in~   2022-10-02 20:26:44.000000000 +0200
-+++ rsync-3.2.7/Makefile.in    2022-10-26 12:00:10.779320246 +0200
-@@ -218,7 +218,6 @@ configure.sh config.h.in: configure.ac a
-           else \
-               echo 'You may need to run:'; \
-               echo '  make reconfigure'; \
+diff -urN rsync-3.2.7.org/Makefile.in rsync-3.2.7/Makefile.in
+--- rsync-3.2.7.org/Makefile.in        2022-10-02 20:26:44.000000000 +0200
++++ rsync-3.2.7/Makefile.in    2022-10-26 13:05:40.582652642 +0200
+@@ -196,31 +196,6 @@
+       aclocal -I $(srcdir)/m4
+ 
+ configure.sh config.h.in: configure.ac aclocal.m4
+-      @if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
+-      @if test -f config.h.in; then cp -p config.h.in config.h.in.old; else touch config.h.in.old; fi
+-      autoconf -o configure.sh
+-      autoheader && touch config.h.in
+-      @if diff configure.sh configure.sh.old >/dev/null 2>&1; then \
+-          echo "configure.sh is unchanged."; \
+-          rm configure.sh.old; \
+-      else \
+-          echo "configure.sh has CHANGED."; \
+-      fi
+-      @if diff config.h.in config.h.in.old >/dev/null 2>&1; then \
+-          echo "config.h.in is unchanged."; \
+-          rm config.h.in.old; \
+-      else \
+-          echo "config.h.in has CHANGED."; \
+-      fi
+-      @if test -f configure.sh.old || test -f config.h.in.old; then \
+-          if test "$(MAKECMDGOALS)" = reconfigure; then \
+-              echo 'Continuing with "make reconfigure".'; \
+-          else \
+-              echo 'You may need to run:'; \
+-              echo '  make reconfigure'; \
 -              exit 1; \
-           fi \
-       fi
+-          fi \
+-      fi
  
+ .PHONY: reconfigure
+ reconfigure: configure.sh

diff --git a/rsync.spec b/rsync.spec
index ec2b037581766b9d0cb62f08e7305c9bae734b2a..8023f15973f06c755df1fd677c12c6b9d709d16b 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -18,7 +18,7 @@ Summary(zh_CN.UTF-8): [通讯]传输工具
 Summary(zh_TW.UTF-8):  [喙啪]\e$(B6G?i火(c\e(B
 Name:          rsync
 Version:       3.2.7
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v3+
 Group:         Networking/Utilities