[packages/rsync] - use patch -P, versioned internal Obsoletes

qboosh qboosh at pld-linux.org
Thu Jan 16 17:57:30 CET 2025


commit 8c1edcb9f72c930496c57ef400159d17f03dcdd2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 16 17:30:48 2025 +0100

    - use patch -P, versioned internal Obsoletes

 rsync.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rsync.spec b/rsync.spec
index 44a4d62..30483df 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -122,7 +122,7 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	rc-inetd
 Provides:	rsyncd
 Obsoletes:	rsyncd < 2.5.6
-Obsoletes:	rsyncd-standalone
+Obsoletes:	rsyncd-standalone <= %{epoch}:%{version}-%{release}
 
 %description -n rsyncd-inetd
 rsync is a replacement for rcp that has many more features.
@@ -149,7 +149,7 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	rsyncd
 Obsoletes:	rsyncd < 2.5.6
-Obsoletes:	rsyncd-inetd
+Obsoletes:	rsyncd-inetd <= %{epoch}:%{version}-%{release}
 
 %description -n rsyncd-standalone
 rsync is a replacement for rcp that has many more features.
@@ -170,9 +170,9 @@ techniczna nowego algorytmu została również dołączona do pakietu.
 
 %prep
 %setup -q -b1
-%patch0 -p1
-%{?with_fadvise:%patch1 -p1}
-%patch2 -p1
+%patch -P0 -p1
+%{?with_fadvise:%patch -P1 -p1}
+%patch -P2 -p1
 
 sed -i -e 's|#!/usr/bin/env bash|#!/bin/bash|' rsync-ssl
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rsync.git/commitdiff/8c1edcb9f72c930496c57ef400159d17f03dcdd2



More information about the pld-cvs-commit mailing list