From 0c65c54f811cb5f350b10fb3f2a56149f63d7fb7c3de64ecfac2db9c765cd8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 9 Aug 2018 09:16:33 +0000
Subject: [PATCH] - Update to 1.9.6:   * No real obvious changelog   * Support
 python 3.7

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysvn?expand=0&rev=39
---
 pysvn-1.9.4.tar.gz   |  3 ---
 pysvn-1.9.6.tar.gz   |  3 +++
 python-pysvn.changes |  7 +++++++
 python-pysvn.spec    | 26 ++++++++++++++------------
 4 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 100644 pysvn-1.9.4.tar.gz
 create mode 100644 pysvn-1.9.6.tar.gz

diff --git a/pysvn-1.9.4.tar.gz b/pysvn-1.9.4.tar.gz
deleted file mode 100644
index 4b7ff2d..0000000
--- a/pysvn-1.9.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b0f61f27c45699f8a944c9e84e32c63ba8870eb095c9fc67c8506ff0a4ba8da
-size 405817
diff --git a/pysvn-1.9.6.tar.gz b/pysvn-1.9.6.tar.gz
new file mode 100644
index 0000000..6998a86
--- /dev/null
+++ b/pysvn-1.9.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1508f63e66fc9d1303f8fd0f49547b59492f6977be4434914c38bc29dc82b2d6
+size 515394
diff --git a/python-pysvn.changes b/python-pysvn.changes
index c37d566..d012a8d 100644
--- a/python-pysvn.changes
+++ b/python-pysvn.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  9 07:15:37 UTC 2018 - tchvatal@suse.com
+
+- Update to 1.9.6:
+  * No real obvious changelog
+  * Support python 3.7
+
 -------------------------------------------------------------------
 Thu Sep  7 12:02:11 UTC 2017 - jengelh@inai.de
 
diff --git a/python-pysvn.spec b/python-pysvn.spec
index 58c0c4a..3d9bf7e 100644
--- a/python-pysvn.spec
+++ b/python-pysvn.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pysvn
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,17 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-pysvn
-Version:        1.9.4
-Release:        0
 %define pcxxver 6.2.8
+Name:           python-pysvn
+Version:        1.9.6
+Release:        0
 Summary:        Highlevel Subversion Python Bindings
 License:        Apache-1.1
 Group:          Development/Libraries/Python
-Url:            http://pysvn.tigris.org
+URL:            http://pysvn.tigris.org
 Source0:        http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pycxx-devel}
 BuildRequires:  %{python_module xml}
 BuildRequires:  gcc-c++
 BuildRequires:  libapr1-devel
@@ -38,7 +39,6 @@ BuildRequires:  python-rpm-macros
 BuildRequires:  subversion-devel
 Requires:       neon
 Requires:       subversion
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %python_subpackages
 
 %description
@@ -55,14 +55,16 @@ Features:
 
 %prep
 %setup -q -n pysvn-%{version}
-# patch in rpm compiler flags
-sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py
 
 %build
+export CFLAGS="%{optflags}"
 %{python_expand cp -r Source Source-%{$python_bin_suffix}
 pushd Source-%{$python_bin_suffix}
 $python setup.py backport
-$python setup.py configure --enable-debug --norpath --pycxx-dir="../Import/pycxx-%{pcxxver}/"
+$python setup.py configure \
+    --enable-debug --verbose --fixed-module-name --norpath \
+    --pycxx-dir=%{$python_sysconfig_path include}/ --pycxx-src-dir=%{_datadir}/python%{$python_bin_suffix}/CXX
+sed -i -e 's@-Wall -fPIC -fexceptions -frtti@%{optflags} -fPIC -frtti@' Makefile
 make %{?_smp_mflags}
 popd
 }
@@ -79,11 +81,11 @@ rm -f Docs/generate_cpp_docs_from_html_docs.py
 
 %check
 cd Tests
-%python_expand PYTHON=$python make %{?_smp_mflags} || true
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHON=$python make %{?_smp_mflags} || :
 
 %files %{python_files}
-%defattr(-,root,root)
-%doc LICENSE.txt Docs Examples
+%license LICENSE.txt
+%doc Docs Examples
 %{python_sitearch}/*
 
 %changelog