[arch-commits] Commit in rsync/trunk (PKGBUILD)

[Christian Hesse]

    Date: Sunday, August 14, 2022 @ 21:25:27
  Author: eworm
Revision: 452714

upgpkg: rsync 3.2.5-2: drop useless merge

This was to collect some fixes for the pre-release, but everything
is included in current release already.

Modified:
  rsync/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-14 20:29:06 UTC (rev 452713)
+++ PKGBUILD	2022-08-14 21:25:27 UTC (rev 452714)
@@ -3,7 +3,7 @@
 pkgname=rsync
 _tag='001cc050f46d05cb0487359ed5101018da14a5a3' # git rev-parse v${pkgver}
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast and versatile file copying tool for remote and local files'
 arch=('x86_64')
 url='https://rsync.samba.org/'
@@ -20,12 +20,6 @@
 sha256sums=('SKIP'
             '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b')
 
-prepare() {
-	cd "$srcdir/rsync"
-
-	git merge --ff-only 'cff8f044776c5143a5b270969d4bb0f1fea8b017'
-}
-
 build() {
 	cd "$srcdir/rsync"