Hello community,
here is the log from the commit of package borgmatic for openSUSE:Factory
checked in at 2017-12-14 10:53:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/borgmatic (Old)
and /work/SRC/openSUSE:Factory/.borgmatic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "borgmatic"
Thu Dec 14 10:53:57 2017 rev:3 rq:540148 version:1.1.9+git20171028.6e9e7c4
Changes:
--------
--- /work/SRC/openSUSE:Factory/borgmatic/borgmatic.changes 2017-03-12
20:04:21.770676390 +0100
+++ /work/SRC/openSUSE:Factory/.borgmatic.new/borgmatic.changes 2017-12-14
10:54:03.141552176 +0100
@@ -1,0 +2,62 @@
+Sun Oct 29 09:16:34 UTC 2017 - alarr...@suse.com
+
+- Upstream moved from mercurial to git, so updated _service accordingly,
+ updated source code to 6e9e7c4 and set all services mode to disabled.
+- Fixed a too restrictive python3-ruamel.yaml version requirement
+ in the source code
+- Add a rcborgmatic symlink as required by the suse-missing-rclink rpmlint
check
+
+-------------------------------------------------------------------
+Wed Sep 20 15:00:11 UTC 2017 - alarr...@suse.com
+
+- Update to 1.1.9dev0-201
+ * #29: Support for using tilde in source directory path to reference home
directory.
+
+- python3-ruamel.yaml and python3-pykwalify are now required
+
+- Update to 1.1.8
+ * #39: Fix to make /etc/borgmatic/config.yaml optional rather than required
when using the default
+ config paths.
+
+- Update to 1.1.7
+ * #28: Add "archive_name_format" to configuration for customizing archive
names.
+ * Fix for traceback when "exclude_from" value is empty in configuration file.
+ * When pruning, make highest verbosity level list archives kept and pruned.
+ * Clarification of Python 3 pip usage in documentation.
+
+- Update to 1.1.6
+ * #12, #35: Support for Borg --exclude-from, --exclude-caches, and
--exclude-if-present options.
+
+- Update to 1.1.5
+ * #34: New "extract" consistency check that performs a dry-run extraction of
the most recent
+ archive.
+
+- Update to 1.1.4
+ * #17: Added command-line flags for performing a borgmatic run with only
pruning, creating, or
+ checking enabled. This supports use cases like running consistency checks
from a different cron
+ job with a different frequency, or running pruning with a different
verbosity level.
+
+- Update to 1.1.3
+ * #14: Support for running multiple config files in /etc/borgmatic.d/ from a
single borgmatic run.
+ * Fix for generate-borgmatic-config writing config with invalid
one_file_system value.
+
+- Update to 1.1.2
+ * #32: Fix for passing check_last as integer to subprocess when calling Borg.
+
+- Update to 1.1.1
+ * Part of #32: Fix for upgrade-borgmatic-config converting check_last option
as a string instead of
+ an integer.
+ * Fix for upgrade-borgmatic-config erroring when consistency checks option
is not present.
+
+- Update to 1.1.0
+ * Switched config file format to YAML. Run upgrade-borgmatic-config to
upgrade.
+ * Added generate-borgmatic-config command for initial config creation.
+ * Dropped Python 2 support. Now Python 3 only.
+ * #18: Fix for README mention of sample files not included in package.
+ * #22: Sample files for triggering borgmatic from a systemd timer.
+ * Support for backing up to multiple repositories.
+ * To free up space, now pruning backups prior to creating a new backup.
+ * Enabled test coverage output during tox runs.
+ * Added logo.
+
+-------------------------------------------------------------------
Old:
----
borgmatic-1.0.3hg.135.tar.xz
New:
----
borgmatic-1.1.9+git20171028.6e9e7c4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ borgmatic.spec ++++++
--- /var/tmp/diff_new_pack.w8slpk/_old 2017-12-14 10:54:03.701525144 +0100
+++ /var/tmp/diff_new_pack.w8slpk/_new 2017-12-14 10:54:03.705524951 +0100
@@ -16,10 +16,10 @@
#
-%define version_unconverted 1.0.3hg.135
+%define version_unconverted 1.1.9+git20171028.6e9e7c4
Name: borgmatic
-Version: 1.0.3hg.135
+Version: 1.1.9+git20171028.6e9e7c4
Release: 0
Summary: Automation tool for borgbackup
License: GPL-3.0
@@ -30,14 +30,17 @@
BuildArch: noarch
BuildRequires: python3 >= 3.4
BuildRequires: python3-devel
+BuildRequires: python3-ruamel.yaml
BuildRequires: python3-setuptools
BuildRequires: systemd-devel
# To create the manpage
BuildRequires: pandoc
-Requires: borgmatic
# testing requirements
BuildRequires: python3-flexmock
+BuildRequires: python3-pykwalify
BuildRequires: python3-pytest
+Requires: python3-pykwalify
+Requires: python3-ruamel.yaml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -49,13 +52,14 @@
common errors.
%prep
-%setup -q
+%setup -q -n %{name}-%{version_unconverted}
# test_version.py fails because of assert '1.0.3.dev0\n' == '1.0.3-dev\n', so
we just remove it
rm borgmatic/tests/integration/test_version.py
# Make sample files use the borgmatic command on /usr/bin, not /usr/local/bin
perl -pi -e "s,PATH=\\$PATH:/usr/local/bin
/usr/local/bin/borgmatic,/usr/bin/borgmatic," sample/cron/borgmatic
perl -pi -e "s,/usr/local/bin/borgmatic,/usr/bin/borgmatic,"
sample/systemd/borgmatic.service
+perl -pi -e "s,ruamel.yaml<=0.15,ruamel.yaml," setup.py
%build
# Create the manpage
@@ -64,13 +68,14 @@
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
install -d %{buildroot}%{_sysconfdir}/borgmatic
-install -m 0644 sample/config sample/excludes
%{buildroot}%{_sysconfdir}/borgmatic/
install -d %{buildroot}%{_docdir}/%{name}/sample/cron
install -m 0644 sample/cron/borgmatic
%{buildroot}%{_docdir}/%{name}/sample/cron/
install -d %{buildroot}%{_unitdir}/
install -m 0644 sample/systemd/borgmatic* %{buildroot}%{_unitdir}/
install -D -m 0644 borgmatic.1 %{buildroot}%{_mandir}/man1/borgmatic.1
+mkdir -p %{buildroot}/usr/sbin
+ln -s /usr/sbin/service %{buildroot}/usr/sbin/rcborgmatic
%check
# testing the build is a little awkward, since the original testsuite is based
on tox and
@@ -85,6 +90,15 @@
%post
%service_add_post borgmatic.service
+if [ "$1" == 1 -a ! -f "/etc/borgmatic/config.yaml" ]; then
+ /usr/bin/generate-borgmatic-config
+elif [ "$1" == 2 ]; then
+ if [ -f "/etc/borgmatic/config" -a ! -f "/etc/borgmatic/config.yaml" ];
then
+ echo "The configuration files have changed.
/usr/bin/upgrade-borgmatic-config will be run now to upgrade the configuration
to the new format."
+ echo ""
+ /usr/bin/upgrade-borgmatic-config
+ fi
+fi
%pre
%service_add_pre borgmatic.service
@@ -98,16 +112,18 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE NEWS README.md
-%config %{_sysconfdir}/borgmatic/config
-%config %{_sysconfdir}/borgmatic/excludes
+%config %ghost %{_sysconfdir}/borgmatic/config.yaml
%dir %{_sysconfdir}/borgmatic
%dir %{_docdir}/%{name}/sample
%dir %{_docdir}/%{name}/sample/cron
%{python3_sitelib}/borgmatic/
-%{python3_sitelib}/borgmatic-1.0.3.dev0-py%{py3_ver}.egg-info
+%{python3_sitelib}/borgmatic-1.1.9.dev0-py%{py3_ver}.egg-info
%{_unitdir}/borgmatic.service
%{_unitdir}/borgmatic.timer
%{_bindir}/borgmatic
+%{_sbindir}/rcborgmatic
+%{_bindir}/generate-borgmatic-config
+%{_bindir}/upgrade-borgmatic-config
%{_mandir}/man1/borgmatic.1%{ext_man}
%{_docdir}/%{name}/sample/cron
++++++ _service ++++++
--- /var/tmp/diff_new_pack.w8slpk/_old 2017-12-14 10:54:03.749522827 +0100
+++ /var/tmp/diff_new_pack.w8slpk/_new 2017-12-14 10:54:03.749522827 +0100
@@ -1,14 +1,14 @@
<services>
- <service name="tar_scm" mode="localonly">
- <param name="scm">hg</param>
- <param name="url">https://torsion.org/hg/borgmatic/</param>
+ <service name="tar_scm" mode="disabled">
+ <param name="scm">git</param>
+ <param name="url">https://projects.torsion.org/witten/borgmatic/</param>
<param name="filename">borgmatic</param>
- <param name="versionformat">1.0.3hg.{rev}</param>
+ <param name="versionformat">1.1.9+git%cd.%h</param>
</service>
- <service name="recompress" mode="localonly">
+ <service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service name="set_version" mode="localonly"/>
+ <service name="set_version" mode="disabled"/>
</services>
