From 306b9ed1f4aa4c1bb4a111ac2ac9065c098642ec Mon Sep 17 00:00:00 2001 From: Michal Ruprich Date: Mar 21 2022 08:46:07 +0000 Subject: Removing part of patch that does not belong --- diff --git a/rsync-3.2.4-hello-test.patch b/rsync-3.2.4-hello-test.patch index e1366cf..e6bb4b7 100644 --- a/rsync-3.2.4-hello-test.patch +++ b/rsync-3.2.4-hello-test.patch @@ -2,15 +2,6 @@ diff --git a/testsuite/00-hello.test b/testsuite/00-hello.test index a359753..ec0279a 100644 --- a/testsuite/00-hello.test +++ b/testsuite/00-hello.test -@@ -15,7 +15,7 @@ $RSYNC --info=help || test_fail '--info=help output failed' - - $RSYNC --debug=help || test_fail '--debug=help output failed' - --weird_name="A weird)name" -+weird_name="Aweirdname" - - mkdir "$fromdir" - mkdir "$fromdir/$weird_name" @@ -29,7 +29,7 @@ append_line test1 checkit "$RSYNC -ai '$fromdir/' '$todir/'" "$fromdir" "$todir" diff --git a/rsync.spec b/rsync.spec index 9ac85d9..50732cf 100644 --- a/rsync.spec +++ b/rsync.spec @@ -9,7 +9,7 @@ Summary: A program for synchronizing files over a network Name: rsync Version: 3.2.4 -Release: 1%{?prerelease}%{?dist} +Release: 2%{?prerelease}%{?dist} URL: https://rsync.samba.org/ Source0: https://download.samba.org/pub/rsync/src/rsync-%{version}%{?prerelease}.tar.gz @@ -37,6 +37,7 @@ Provides: bundled(zlib) = 1.2.8 License: GPLv3+ Patch1: rsync-3.2.2-runtests.patch +#needed to make hello test run correctly Patch2: rsync-3.2.4-hello-test.patch %description @@ -124,6 +125,9 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service %systemd_postun_with_restart rsyncd.service %changelog +* Mon Mar 21 2022 Michal Ruprich - 3.2.4-2pre3 +- Removing part of patch that does not belong + * Wed Mar 16 2022 Michal Ruprich - 3.2.4-1pre3 - New pre-release version 3.2.4pre3