commit a9043ab15e63126cf8a6f870713aeddbc7caa42f
Author: Jan Rękorajski <[email protected]>
Date: Thu Mar 9 22:31:19 2017 +0100
- up to 1.20151025
make-tests.patch | 11 +++++++++++
python-larch.spec | 28 ++++++++++++++++------------
sphinx2.patch | 11 +++++++++++
3 files changed, 38 insertions(+), 12 deletions(-)
---
diff --git a/python-larch.spec b/python-larch.spec
index 0bdd0bd..6e7803f 100644
--- a/python-larch.spec
+++ b/python-larch.spec
@@ -2,21 +2,23 @@
# Conditional build:
%bcond_without tests # do not perform "make test"
-%define module larch
+%define module larch
Summary: Python B-tree library
Name: python-%{module}
-Version: 1.20130808
-Release: 2
+Version: 1.20151025
+Release: 1
License: GPL v3+
Group: Libraries/Python
-Source0:
http://code.liw.fi/debian/pool/main/p/python-%{module}/%{name}_%{version}.orig.tar.gz
-# Source0-md5: 9132c891a508d836c39d2ac3a6b7c2f6
+Source0:
http://code.liw.fi/debian/pool/main/p/python-%{module}/%{name}_%{version}.orig.tar.xz
+# Source0-md5: 1c7dd2ed0bfc377ad04694e7ddb4164b
+Patch0: make-tests.patch
+Patch1: sphinx2.patch
URL: http://liw.fi/larch/
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.710
# build-time only
BuildRequires: cmdtest
-BuildRequires: python-Sphinx
+BuildRequires: sphinx-pdg-2
BuildRequires: python-coverage-test-runner
# build- and run-time
BuildRequires: python-cliapp
@@ -64,7 +66,9 @@ This package contains the documentation for %{module}, a
Python
framework for Unix command line programs.
%prep
-%setup -q -n %{module}-%{version}
+%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%if %{with tests}
@@ -77,21 +81,21 @@ rm -rf build
%py_build
# Build documentation
-%{__make}
+%{__make} PYTHONPATH=$(pwd)
%install
rm -rf $RPM_BUILD_ROOT
%py_install
+# manpage not installed automatically yet
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p fsck-larch.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
# drop internal tests
%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/larch/*_tests.py*
%py_postclean
-# manpage not installed automatically yet
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p fsck-larch.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/make-tests.patch b/make-tests.patch
new file mode 100644
index 0000000..55dcf1e
--- /dev/null
+++ b/make-tests.patch
@@ -0,0 +1,11 @@
+--- python-larch-1.20151025/Makefile~ 2015-10-25 11:32:45.000000000 +0100
++++ python-larch-1.20151025/Makefile 2017-03-09 21:59:45.078426799 +0100
+@@ -23,7 +23,7 @@
+
+ check:
+ python -m CoverageTestRunner --ignore-missing-from=without-tests
+- rm .coverage
++ rm -f .coverage
+ ./insert-remove-test tempdir 100
+ rm -r tempdir larch.log
+ cmdtest tests
diff --git a/sphinx2.patch b/sphinx2.patch
new file mode 100644
index 0000000..e7a895d
--- /dev/null
+++ b/sphinx2.patch
@@ -0,0 +1,11 @@
+--- python-larch-1.20151025/doc/Makefile~ 2015-10-25 11:32:45.000000000
+0100
++++ python-larch-1.20151025/doc/Makefile 2017-03-09 22:23:04.499113444
+0100
+@@ -3,7 +3,7 @@
+
+ # You can set these variables from the command line.
+ SPHINXOPTS =
+-SPHINXBUILD = sphinx-build
++SPHINXBUILD = sphinx-build-2
+ PAPER =
+ BUILDDIR = _build
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-larch.git/commitdiff/a9043ab15e63126cf8a6f870713aeddbc7caa42f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
