Merge branch 'master' of https://github.com/jimsalterjrs/sanoid

INSTALL

@@ -10,14 +10,13 @@ is not available on either end of the transport.
 On Ubuntu: apt install pv lzop mbuffer
 On FreeBSD: pkg install pv lzop
 
-FreeBSD notes: mbuffer is not currently recommended due to oddities in 
- FreeBSD's local implementation. Internal network buffering
- capability is on the roadmap soon to remove mbuffer dependency
- anyway. FreeBSD places pv and lzop in /usr/local/bin instead
- of /usr/bin ; syncoid currently does not check path.
+FreeBSD notes: FreeBSD may place pv and lzop in somewhere other than
+ /usr/bin ; syncoid currently does not check path.
 
  Simplest path workaround is symlinks, eg:
  root@bsd:~# ln -s /usr/bin/lzop /usr/local/bin/lzop
+ or similar, as appropriate, to create links in /usr/bin
+ to wherever the utilities actually are on your system.
 
 
 SANOID

README.md

@@ -1,5 +1,4 @@
 <p align="center"><img src="http://www.openoid.net/wp-content/themes/openoid/images/sanoid_logo.png" alt="sanoid logo" title="sanoid logo"></p>
-======
 
 <img src="http://openoid.net/gplv3-127x51.png" width=127 height=51 align="right">Sanoid is a policy-driven snapshot management tool for ZFS filesystems. When combined with the Linux KVM hypervisor, you can use it to make your systems <a href="http://openoid.net/transcend" target="_blank">functionally immortal</a>. 
 

sanoid.spec

@@ -1,47 +1,68 @@
+%global version 1.4.13
+%global git_tag v%{version}
+
 Name: sanoid
-Version: 1.4.4
+Version: %{version}
 Release: 1%{?dist}
 BuildArch: noarch
-Summary: A policy-driven snapshot management tool for ZFS filesystems
-
+Summary: A policy-driven snapshot management tool for ZFS file systems
 Group: Applications/System
 License: GPLv3
 URL: https://github.com/jimsalterjrs/sanoid
-Source0: https://github.com/jimsalterjrs/sanoid/archive/sanoid-master.zip
+Source0: https://github.com/jimsalterjrs/%{name}/archive/%{git_tag}/%{name}-%{version}.tar.gz
 #BuildRequires: 
-Requires: perl
+Requires: perl, mbuffer, lzop, pv
 
 %description
 Sanoid is a policy-driven snapshot management
-tool for ZFS filesystems. You can use Sanoid
+tool for ZFS file systems. You can use Sanoid
 to create, automatically thin, and monitor snapshots
 and pool health from a single eminently
-human-readable TOML config file.
+human-readable TOML configuration file.
 
 %prep
-%setup -q -n sanoid-master
-%patch0 -p1
+%setup -q
 
 %build
 
 %install
 %{__install} -D -m 0644 sanoid.defaults.conf %{buildroot}/etc/sanoid/sanoid.defaults.conf
 %{__install} -d %{buildroot}%{_sbindir}
 %{__install} -m 0755 sanoid syncoid findoid sleepymutex %{buildroot}%{_sbindir}
+
+%if 0%{?fedora}
+%{__install} -D -m 0644 sanoid.conf %{buildroot}%{_docdir}/%{name}/examples/sanoid.conf
+echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}/examples/sanoid.cron
+%endif
+%if 0%{?rhel}
 %{__install} -D -m 0644 sanoid.conf %{buildroot}%{_docdir}/%{name}-%{version}/examples/sanoid.conf
 echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}-%{version}/examples/sanoid.cron
+%endif
 
 %files
-%doc CHANGELIST LICENSE VERSION README.md
+%doc CHANGELIST VERSION README.md FREEBSD.readme
+%license LICENSE
 %{_sbindir}/sanoid
 %{_sbindir}/syncoid
 %{_sbindir}/findoid
 %{_sbindir}/sleepymutex
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/%{name}/sanoid.defaults.conf
-
-
+%if 0%{?fedora}
+%{_docdir}/%{name}
+%endif
+%if 0%{?rhel}
+%{_docdir}/%{name}-%{version}
+%endif
 
 %changelog
+* Wed Jul 12 2017 Thomas M. Lapp <[email protected]> - 1.4.13-1
+- Version bump
+- Include FREEBSD.readme in docs
+* Wed Jul 12 2017 Thomas M. Lapp <[email protected]> - 1.4.9-1
+- Version bump
+- Clean up variables and macros
+- Compatible with both Fedora and Red Hat
+
 * Sat Feb 13 2016 Thomas M. Lapp <[email protected]> - 1.4.4-1
 - Initial RPM Package