$ git diff --patch-with-stat --summary dd2c57a2bcd9b4ccf749c0fa290a3fe3f1c423d0..a9b8ffdb9a4eb7cc32e9661bd9c9203ca957db2a

 .abf.yml              |   2 +-
 .onedev-buildspec.yml |   4 +
 snapper.spec          | 214 ++++++++++++++++++++++++++++----------------------
 3 files changed, 126 insertions(+), 94 deletions(-)
 create mode 100644 .onedev-buildspec.yml

diff --git a/.abf.yml b/.abf.yml
index 12d4201..11609ce 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  snapper-0.10.4.tar.gz: ce0404a2f12e4f5e134641471faa66d8deb701c3
+  snapper-0.13.1.tar.gz: ba4e2eb0f15f305fa439115a1a5c079a288d0a7d
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
new file mode 100644
index 0000000..b95f83a
--- /dev/null
+++ b/.onedev-buildspec.yml
@@ -0,0 +1,4 @@
+version: 40
+imports:
+- projectPath: OpenMandriva/Packages
+  revision: mirroring
diff --git a/snapper.spec b/snapper.spec
index 0764075..8c7eff2 100644
--- a/snapper.spec
+++ b/snapper.spec
@@ -5,129 +5,157 @@
 
 Summary:	Tool for filesystem snapshot management
 Name:		snapper
-Version:	0.10.4
+Version:	0.13.1
 Release:	1
 License:	GPLv2+
-Group:		Archiving/Backup
-Url:		http://snapper.io
+Group:	Archiving/Backup
+Url:		https://snapper.io
 Source0:  https://github.com/openSUSE/snapper/archive/v%{version}/%{name}-%{version}.tar.gz
-
-BuildRequires:  autoconf
-BuildRequires:  automake
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	docbook-xsl
+BuildRequires:	gettext
 BuildRequires:  libtool
-BuildRequires:  gettext
-BuildRequires:  make
-BuildRequires:  systemd-rpm-macros
-BuildRequires:  xsltproc
-BuildRequires:  docbook-xsl
-
-# devels
-BuildRequires:  boost-devel
-BuildRequires:  pkgconfig(libbtrfsutil)
-BuildRequires:  pkgconfig(mount)
-BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libacl)
-BuildRequires:  pkgconfig(ext2fs)
-BuildRequires:  pkgconfig(json-c)
-BuildRequires:  pkgconfig(ncurses)
-BuildRequires:  pkgconfig(pam)
-
-Requires:       diffutils
-Requires:       %{libname} = %{version}-%{release}
+BuildRequires:	libtool-base
+BuildRequires:	make
+#BuildRequires:	slibtool
+BuildRequires:	systemd-rpm-macros
+BuildRequires:	xsltproc
+BuildRequires:	boost-devel
+BuildRequires:	pkgconfig(dbus-1)
+BuildRequires:	pkgconfig(ext2fs)
+BuildRequires:	pkgconfig(json-c)
+BuildRequires:	pkgconfig(libacl)
+BuildRequires:	pkgconfig(libbtrfsutil)
+BuildRequires:	pkgconfig(libselinux)
+BuildRequires:	pkgconfig(libxml-2.0)
+BuildRequires:	pkgconfig(mount)
+BuildRequires:	pkgconfig(ncurses)
+BuildRequires:	pkgconfig(pam)
+BuildRequires:	pkgconfig(zlib)
+Requires:	diffutils
+Requires:	logrotate
+Requires:	%{libname} = %{version}-%{release}
 
 %description
-Manage filesystem snapshots and allow undo of system modifications
+Manage filesystem snapshots and allow undo of system modifications.
+
+%files -f %{name}.lang
+%license COPYING
+%doc AUTHORS README.md
+#%%{_datadir}/doc/%%{name}/AUTHORS
+#doc %%{_datadir}/doc/%%{name}/COPYING
+%{_sysconfdir}/logrotate.d/%{name}
+%{_bindir}/mksubvolume
+%{_bindir}/%{name}
+%{_bindir}/snapperd
+%{_bindir}/snbk
+%{_libexecdir}/%{name}/installation-helper
+%{_libexecdir}/%{name}/systemd-helper
+%{_datadir}/%{name}/config-templates/default
+%{_datadir}/%{name}/filters/*.txt
+%{_datadir}/%{name}/zypp-plugin.conf
+%{_datadir}/bash-completion/completions/%{name}
+%{_datadir}/bash-completion/completions/snbk
+%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
+%{_datadir}/dbus-1/system.d/org.opensuse.Snapper.conf
+%{_datadir}/zsh/site-functions/_%{name}
+%{_unitdir}/%{name}-*.service
+%{_unitdir}/%{name}-*.timer
+%{_unitdir}/snapperd.service
+%{_prefix}/lib/pam_%{name}/*.sh
+%{_prefix}/lib/zypp/plugins/commit/%{name}-zypp-plugin
+%{_mandir}/man5/%{name}-backup-configs.5.*
+%{_mandir}/man5/%{name}-configs.5.*
+%{_mandir}/man5/%{name}-zypp-plugin.conf.5.*
+%{_mandir}/man8/mksubvolume.8.*
+%{_mandir}/man8/pam_snapper.8.*
+%{_mandir}/man8/%{name}-zypp-plugin.8.*
+%{_mandir}/man8/%{name}.8.*
+%{_mandir}/man8/snapperd.8.*
+%{_mandir}/man8/snbk.8.*
+# Locales here bc my mind fog...
+#{_datadir}/locale/*/LC_MESSAGES/%%{name}.mo
+
+
+%post
+%systemd_post %{snapper_svcs}
+ 
+%preun
+%systemd_preun %{snapper_svcs}
+ 
+%postun
+%systemd_postun_with_restart %{snapper_svcs}
+
+#-----------------------------------------------------------------------------
 
 %package -n %{libname}
-Summary:        Shared library for %{name}
+Summary:		Shared library for %{name}
+Group:	System/Libraries
+# Circular dep
+#Requires:	%%{name} = %%{version}-%%{release}
+Requires:	util-linux
+Requires:	btrfs-progs
 
 %description -n %{libname}
-This package contains the snapper shared library
-for filesystem snapshot management.
-Requires:	%{name} = %{version}-%{release}
-Requires:       util-linux
-Requires:       btrfs-progs
+This package contains the snapper shared library for filesystem snapshot
+management.
+
+%files -n %{libname}
+%{_libdir}/libsnapper.so.*
+%{_libdir}/security/pam_snapper.so
+
+#-----------------------------------------------------------------------------
 
 %package -n %{devname}
-Summary:        Development files for %{name}
+Summary:		Development files for %{name}
+Group:	Development/C++
 Requires:	%{libname} = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+#Requires:	%%{name} = %%{version}-%%{release}
 
 %description -n %{devname}
-This package contains header files and documentation for developing with snapper.
+This package contains header files and documentation for developing
+with snapper.
+
+%files -n %{devname}
+%{_libdir}/libsnapper.so
+%{_libdir}/snapper/testsuite/
+%{_includedir}/%{name}/
+
+#-----------------------------------------------------------------------------
 
 %prep
 %autosetup -p1
+
 # use libexecdir
 find -type f -exec sed -i -e "s|/usr/lib/snapper|%{_libexecdir}/%{name}|g" {} ';'
 
+# Fix FSF address
+sed -i 's/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA/31 Milk Street, # 960789, Boston, MA 02196, USA/g' COPYING
+
+
 %build
+# Slibtool won't work with snapper
+ln -sf %{_bindir}/libtoolize slibtoolize
+export PATH=$PWD:$PATH
+export LIBTOOLIZE=%{_bindir}/libtoolize
+export LIBTOOL=%{_bindir}/libtool
 autoreconf -vfi
-%configure \
-           --enable-ext4 \
-           --enable-zypp
+%configure --enable-selinux
+
 %make_build
 
+
 %install
 %make_install
 
+# Not interesting stuff
 rm -rf %{buildroot}%{_sysconfdir}/cron.hourly
 rm -rf %{buildroot}%{_sysconfdir}/cron.daily
 
-%post
-%systemd_post %{snapper_svcs}
- 
-%preun
-%systemd_preun %{snapper_svcs}
- 
-%postun
-%systemd_postun_with_restart %{snapper_svcs}
+# We pick them with our macro
+rm -f %{buildroot}%{_docdir}/%{name}/AUTHORS
+rm -f %{buildroot}%{_docdir}/%{name}/COPYING
 
-#{find_lang} snapper
 
-%files
-%doc %{_datadir}/doc/snapper/AUTHORS
-%doc %{_datadir}/doc/snapper/COPYING
-%{_bindir}/mksubvolume
-%{_bindir}/snapper
-%{_bindir}/snapperd
-%{_sysconfdir}/logrotate.d/snapper
-%{_libexecdir}/%{name}/installation-helper
-%{_libexecdir}/%{name}/systemd-helper
-%{_datadir}/bash-completion/completions/snapper
-%{_datadir}/dbus-1/system-services/org.opensuse.Snapper.service
-%{_datadir}/dbus-1/system.d/org.opensuse.Snapper.conf
-%{_datadir}/snapper/config-templates/default
-%{_datadir}/snapper/filters/base.txt
-%{_datadir}/snapper/filters/lvm.txt
-%{_datadir}/snapper/filters/x11.txt
-%{_datadir}/snapper/zypp-plugin.conf
-%{_prefix}/lib/systemd/system/snapper-boot.service
-%{_prefix}/lib/systemd/system/snapper-boot.timer
-%{_prefix}/lib/systemd/system/snapper-cleanup.service
-%{_prefix}/lib/systemd/system/snapper-cleanup.timer
-%{_prefix}/lib/systemd/system/snapper-timeline.service
-%{_prefix}/lib/systemd/system/snapper-timeline.timer
-%{_prefix}/lib/systemd/system/snapperd.service
-%{_prefix}/lib/pam_snapper/
-%{_prefix}/lib/zypp/plugins/commit/snapper-zypp-plugin
-%{_mandir}/man5/snapper-configs.5.*
-%{_mandir}/man5/snapper-zypp-plugin.conf.5.*
-%{_mandir}/man8/mksubvolume.8.*
-%{_mandir}/man8/pam_snapper.8.*
-%{_mandir}/man8/snapper-zypp-plugin.8.*
-%{_mandir}/man8/snapper.8.*
-%{_mandir}/man8/snapperd.8.*
-# Locales here bc my mind fog...
-%{_datadir}/locale/*/LC_MESSAGES/snapper.mo
-
-%files -n %{libname}
-%{_libdir}/libsnapper.so.*
-%{_libdir}/security/pam_snapper.so
-
-%files -n %{devname}
-%{_libdir}/libsnapper.so
-%{_libdir}/snapper/testsuite/
-%{_includedir}/%{name}/
+%{find_lang} snapper