diff --git a/.gitignore b/.gitignore index 18accdd..76b2d64 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /casync-2434f4c.tar.gz /casync-cc63fcd.tar.gz /casync-2.tar.gz +/casync-b3337dd.tar.gz diff --git a/casync.spec b/casync.spec index d075229..663ab19 100644 --- a/casync.spec +++ b/casync.spec @@ -1,24 +1,22 @@ -#global gitcommit cc63fcd2b23def5ca6b824cdaf7ba6deda3d23de -%{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})} +%global commit b3337dd90b4725052d62d816f0aa433fd467a9d2 +%{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} Name: casync Version: 2 -Release: 9%{?gitcommit:.git%{gitcommitshort}}%{?dist} +Release: 10%{?commit:.git%{shortcommit}}%{?dist} Summary: Content Addressable Data Synchronizer License: LGPLv2+ URL: https://github.com/systemd/casync -%if %{defined gitcommit} -Source0: https://github.com/keszybz/casync/archive/%{?gitcommit}/casync-%{shortcommit}.tar.gz +%if %{defined commit} +Source0: https://github.com/keszybz/casync/archive/%{?commit}/casync-%{shortcommit}.tar.gz %else Source0: https://github.com/systemd/casync/archive/v%{version}/%{name}-%{version}.tar.gz %endif -Patch0001: 0001-Fix-segv-in-ca_remote_forget_chunk.patch -Patch0002: 0001-Fix-seed-chunker-discriminator-not-set-78.patch -Patch0003: 0001-build-check-for-renameat2-copy_file_range-with-_GNU_.patch BuildRequires: meson BuildRequires: gcc +BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(liblzma) >= 5.1.0 BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(zlib) @@ -44,18 +42,13 @@ original data. When the original data is modified, only the new chunks have to be transferred during an update. %prep -%if %{defined gitcommit} -%autosetup -n %{name}-%{gitcommit} -p1 -%else -%autosetup -p1 -%endif +%autosetup -p1 %{?commit:-n %{name}-%{commit}} %build %meson %meson_build %check -export LC_CTYPE=C.utf8 %meson_test %install @@ -75,6 +68,14 @@ export LC_CTYPE=C.utf8 %_udevrulesdir/75-casync.rules %changelog +* Thu Feb 21 2019 Zbigniew Jędrzejewski-Szmek - 2-10.gitb3337dd +- Update to snapshot version: the biggest feature addition are: + * the gc verb + * support for .caexclude files + * support for quota project IDs + Otherwise, this is mostly a lot of bugfixes. +- Fix compilation (#1676286) + * Thu Jan 31 2019 Fedora Release Engineering - 2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 332e119..4a2d86e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (casync-2.tar.gz) = d3f27a8af75c07030cbd465bc716f74b1389234ff03c4043f76e898a2c2633ca6352618c89330aca6b83ff8d09082ff7d7a3d835035665c4f9eab9dc643fd3cf +SHA512 (casync-b3337dd.tar.gz) = 5da9ce4408c86dc5ba636d2d68253b3fdffc4570d10f99ff11f36bb565cdeda7c41e1e892c40bc6ceedf401a8c29175c842c5c8c130879e1df9a956588f84d0d