Bladeren bron

rsync-3.2.5~pre2-1

Tomohiro "Tomo-p" KATO 2 jaren geleden
bovenliggende
commit
9be6428385
1 gewijzigde bestanden met toevoegingen van 15 en 12 verwijderingen
  1. 15 12
      r/rsync/rsync-vl.spec

+ 15 - 12
r/rsync/rsync-vl.spec

@@ -1,10 +1,13 @@
 %bcond_with systemd
 
+%define ver 3.2.5
+%define prerelease pre2
+
 Summary:     A program for synchronizing files over a network.
 Summary(ja): ネットワーク越しにファイルを同期させるプログラム
 Name: rsync
-Version: 3.2.3
-Release: 2%{_dist_release}%{?with_systemd:.systemd}
+Version: %{ver}%{?prerelease:~%{prerelease}}
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: network
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -12,8 +15,8 @@ Packager: daisuke
 
 License: GPLv3+
 URL: https://rsync.samba.org/
-Source:	https://download.samba.org/pub/rsync/src/rsync-%{version}.tar.gz
-Source1: https://download.samba.org/pub/rsync/src/rsync-patches-%{version}.tar.gz
+Source:	https://download.samba.org/pub/rsync/src%{?prerelease:-previews}/rsync-%{ver}%{?prerelease:%{prerelease}}.tar.gz
+Source1: https://download.samba.org/pub/rsync/src%{?prerelease:-previews}/rsync-patches-%{ver}%{?prerelease:%{prerelease}}.tar.gz
 Source2: rsyncd.socket
 Source3: rsyncd.service
 Source4: rsyncd.conf
@@ -21,8 +24,6 @@ Source5: rsyncd.sysconfig
 Source6: rsyncd@.service
 Source100: rsync.xinetd
 
-#Added temporarily until new rebase
-Patch0: rsync-3.2.2-ssl-verify-hostname.patch
 #Added due to rhbz#1873975 - default-acls test fail on s390x due to libacl
 Patch1: rsync-3.2.2-runtests.patch
 
@@ -75,20 +76,18 @@ package provides the anonymous rsync service.
 
 
 %prep
-%setup -q -b 1
-
-#Enable --copy-devices parameter
-patch -p1 -i patches/copy-devices.diff
+%setup -q -n rsync-%{ver}%{?prerelease:%{prerelease}}
+%setup -q -b 1 -n rsync-%{ver}%{?prerelease:%{prerelease}}
 
-%patch0 -p1 -b .verify-hostname
 %patch1 -p1 -b .runtests
 
 # security fixes
 # none
 
+
 %build
 %configure --disable-xxhash
-make %{?_smp_mflags} CCOPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -152,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 10 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.5~pre2-1
+- updated to 3.2.5pre2.
+- dropped Patch0.
+
 * Mon Oct 04 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.3-2
 - rebuilt with openssl-3.0.0.