From 51bce7d614547c63b39a0cb17d092bd393616489 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Feb 02 2008 21:18:55 +0000 Subject: New prerelease pre8 --- diff --git a/.cvsignore b/.cvsignore index aeac9a6..67800f0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -rsync-3.0.0pre4.tar.gz +rsync-3.0.0pre8.tar.gz +rsync-patches-3.0.0pre8.tar.gz diff --git a/rsync.spec b/rsync.spec index f242cf8..e8f6599 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,12 +1,14 @@ Summary: A program for synchronizing files over a network. Name: rsync Version: 3.0.0 -Release: 0.pre4%{?dist} +Release: 0.pre8%{?dist} Group: Applications/Internet # TAG: for pre versions use -Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre4.tar.gz -#Source: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz -Source1: rsync.xinetd +Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre8.tar.gz +#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz +Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre8.tar.gz +#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz +Source2: rsync.xinetd BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel Prefix: %{_prefix} BuildRoot: /var/tmp/%{name}-root @@ -23,12 +25,16 @@ package. %prep # TAG: for pre versions use -%setup -q -n rsync-%{version}pre4 +%setup -q -n rsync-%{version}pre8 #%setup -q +%setup -q -b 1 -n rsync-%{version}pre8 +#%setup -q -b 1 #Needed for compatibility with previous patched rsync versions -patch -p1 < patches/acls.diff -patch -p1 < patches/xattrs.diff +patch -p1 -i patches/acls.diff + +# ********* TEMPORARY, REMOVE [-N and ||:] WHEN FIXED ********** +patch -N -p1 -i patches/xattrs.diff || : %build rm -fr autom4te.cache @@ -43,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT %makeinstall mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/xinetd.d/rsync +install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/rsync %clean rm -rf $RPM_BUILD_ROOT @@ -57,6 +63,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/rsyncd.conf.5* %changelog +* Sat Feb 2 2008 Simo Sorce 3.0.0-0.pre8.fc9 +- Eight prerelease +- Add second source, now patches are in a separate file +- Add temporary fix to the xattrs.diff patch line as, in this version + the patch contains one extra humk already contained in acls.diff + * Sat Oct 27 2007 Simo Sorce 3.0.0-0.pre4.fc9 - Fourth prerelease diff --git a/sources b/sources index 0c3f347..fd1587e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -910fcb6fa18033145c4784cc9ea96e32 rsync-3.0.0pre4.tar.gz +cb6a0042202c1ece2232e1cbb02b8052 rsync-3.0.0pre8.tar.gz +f88e323f5795ffb6dafa1c5d19cb9423 rsync-patches-3.0.0pre8.tar.gz