diff --git a/.gitignore b/.gitignore index 35a0d63..a7c04f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /borgbackup-1.0.0.tar.gz /clog /borgbackup-1.0.1.tar.gz +/borgbackup-1.0.2.tar.gz diff --git a/borgbackup.spec b/borgbackup.spec index 4bfe7e8..a1f6f47 100644 --- a/borgbackup.spec +++ b/borgbackup.spec @@ -1,14 +1,16 @@ %global srcname borgbackup Name: %{srcname} -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: A deduplicating backup program with compression and authenticated encryption License: BSD URL: https://borgbackup.readthedocs.org Source0: http://pypi.python.org/packages/source/b/%{srcname}/%{srcname}-%{version}.tar.gz +Patch0: utf8_to_unicode_string_literal.patch + # build BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools @@ -21,8 +23,15 @@ BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-msgpack >= 0.4.6 # docs +%if 0%{?rhel} +# pyton3-sphinx packages are not available in epel +# so we use the old python2 +BuildRequires: python-sphinx +BuildRequires: python-sphinx_rtd_theme +%else BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: python%{python3_pkgversion}-sphinx_rtd_theme +%endif # no python deps BuildRequires: fuse @@ -39,9 +48,13 @@ BorgBackup (short: Borg) is a deduplicating backup program. Optionally, it supports compression and authenticated encryption. %prep -%autosetup -n %{srcname}-%{version} +%setup -n %{srcname}-%{version} rm -rf %{srcname}.egg-info +# epel has an old version of sphinx and therefore +# it needs a patched docs until its fixed upstream +%patch0 -p1 + %build %py3_build %{__python3} setup.py build_ext --inplace @@ -49,7 +62,13 @@ rm -rf %{srcname}.egg-info # manpage %{__python3} setup.py build_usage %{__python3} setup.py build_api + + +%if 0%{?rhel} +make -C docs man +%else make -C docs SPHINXBUILD=sphinx-build-3 man +%endif %install find . -name *.so -type f -exec chmod 0755 {} \; @@ -71,6 +90,10 @@ PYTHONPATH=$(pwd) py.test-3 --pyargs borg.testsuite -vk "not test_non_ascii_acl %changelog +* Sat Apr 16 2016 Benjamin Pereto - 1.0.2-1 +- added epel7 specific parts +- make manpage generation work with epel7 + * Sat Apr 16 2016 Benjamin Pereto - 1.0.1-2 - simplified specfile - removed unneeded dependencies: python3-mock, python3-pytest-cov diff --git a/sources b/sources index 935b5ef..c138e34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c31c05be72aaa7e7c3ad670424c20ed7 borgbackup-1.0.1.tar.gz +2b1191981f82160bea45220ac106eb7e borgbackup-1.0.2.tar.gz diff --git a/utf8_to_unicode_string_literal.patch b/utf8_to_unicode_string_literal.patch new file mode 100644 index 0000000..f182a54 --- /dev/null +++ b/utf8_to_unicode_string_literal.patch @@ -0,0 +1,11 @@ +--- a/docs/conf.py 2016-04-03 17:16:30.000000000 +0200 ++++ b/docs/conf.py 2016-04-17 12:26:06.000000000 +0200 +@@ -44,7 +44,7 @@ + + # General information about the project. + project = 'Borg - Deduplicating Archiver' +-copyright = '2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' ++copyright = u'2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)' + + # The version info for the project you're documenting, acts as replacement for + # |version| and |release|, also used in various other places throughout the