Update to recent git snapshot. Add a python3 subpackage.

.gitignore

@@ -1,3 +1 @@
-/stp-stp-5405af4.tar.gz
-/stp-stp-3785148.tar.gz
-/stp-stp-b67aa83.tar.gz
+/stp-stp-*.tar.gz

sources

@@ -1 +1 @@
-SHA512 (stp-stp-b67aa83.tar.gz) = 6d819da7d0605d3a5b858a3f23831a2ca7b5cb6d4a123ca8968926447fe55a6327623c345b06631a778d367a74793eb525c2dcfd5ccedcecc6094fb17d8f624c
+SHA512 (stp-stp-c68788e.tar.gz) = 4027e284e6e6fda0c323c68f44bbf4567d49d458ccb56cc3462939ae10d647dae7803b9c9b0cf4d7d63bba0c7a4a680d42a7a9b62719e8d65f2a353a197c97a9

stp.spec

@@ -1,13 +1,13 @@
 # Upstream occasionally releases a git snapshot, but no "regular" releases
 # since the 0.1 release.
-%global gitdate		20171116
-%global gittag		b67aa8396762a5831f0d228b4db26e77392774ae
+%global gitdate		20180607
+%global gittag		c68788eb05731ae08e4f730a6b1c93803620e2b9
 %global shorttag	%(cut -b -7 <<< %{gittag})
 %global user		stp
 
 Name:		stp
-Version:	2.1.2
-Release:	12.%{gitdate}git.%{shorttag}%{?dist}
+Version:	2.3.1
+Release:	1.%{gitdate}git.%{shorttag}%{?dist}
 Summary:	Constraint solver/decision procedure
 
 License:	MIT
@@ -26,6 +26,7 @@ BuildRequires:	minisat2-devel
 BuildRequires:	flex
 BuildRequires:	perl(Getopt::Long)
 BuildRequires:	python2-devel
+BuildRequires:	python3-devel
 
 %description
 STP (Simple Theorem Prover) is a constraint solver (also referred to as
@@ -64,6 +65,16 @@ BuildArch:	noarch
 %description -n python2-%{name}
 Python 2 interface to STP.
 
+%package -n python3-%{name}
+Summary:	Python 3 interface to STP
+Requires:	%{name} = %{version}-%{release}
+BuildArch:	noarch
+
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-%{name}
+Python 3 interface to STP.
+
 %prep
 %setup -q -n %{user}-%{name}-%{shorttag}
 %patch0
@@ -77,6 +88,9 @@ sed '/SATSolver.h/a#undef var_Undef\n#undef l_True\n#undef l_False\n#undef l_Und
 touch -r include/stp/Sat/CryptoMinisat5.h.orig include/stp/Sat/CryptoMinisat5.h
 rm -f include/stp/Sat/CryptoMinisat5.h.orig
 
+# Prepare to build for both python 2 and 3
+cp -a . ../python3
+
 %build
 export CFLAGS="%{optflags} -I %{_includedir}/minisat"
 export CXXFLAGS="%{optflags} -I %{_includedir}/minisat"
@@ -85,7 +99,21 @@ export LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS"
 # FIXME: %%{?_smp_mflags} doesn't work due to running genkinds.pl too late
 make
 
+# Build the python 3 binding
+pushd ../python3
+%cmake -DPYTHON_EXECUTABLE:FILEPATH=%{_bindir}/python%{python3_version} \
+       -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}.so \
+       -DPYTHON_INCLUDE_DIR:FILEPATH=%{_includedir}/python%{python3_version}
+make
+popd
+
 %install
+# Install the python 3 version
+pushd ../python3
+make install DESTDIR=%{buildroot}
+popd
+
+# Install the python 2 version
 make install DESTDIR=%{buildroot}
 
 %files
@@ -102,7 +130,14 @@ make install DESTDIR=%{buildroot}
 %files -n python2-%{name}
 %{python2_sitelib}/%{name}/
 
+%files -n python3-%{name}
+%{python3_sitelib}/%{name}/
+
 %changelog
+* Wed Jun 13 2018 Jerry James <loganjerry@gmail.com> - 2.3.1-1.20180607git.c68788e
+- Update to recent git snapshot
+- Add a python3 subpackage
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-12.20171116git.b67aa83
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild