From 6b2e3b5a1ae8552218ba9303f8fcf5b1efc198a2 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Wed, 17 Apr 2019 18:56:37 -0600
Subject: [PATCH] New upstream version.

---
 .gitignore |  2 +-
 sources    |  2 +-
 stp.spec   | 23 +++++++----------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16e9142..fee5b12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/stp-stp-*.tar.gz
+/stp-*.tar.gz
diff --git a/sources b/sources
index bde49c6..6f18107 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stp-stp-d7d6530.tar.gz) = 5f34164d068c263cd33271368903e499870afa932c806a6f3cb32713d97b751748bbe35f1a604d8aa1547ad9ce59433587ca2112eeeeb2b7a8268bbfa3819087
+SHA512 (stp-2.3.3.tar.gz) = a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
diff --git a/stp.spec b/stp.spec
index 64d53bb..35bad69 100644
--- a/stp.spec
+++ b/stp.spec
@@ -1,18 +1,11 @@
-# Upstream occasionally releases a git snapshot, but no "regular" releases
-# since the 0.1 release.
-%global gitdate		20181115
-%global gittag		d7d65301f6cbe381004bad09a141dcea8632caff
-%global shorttag	%(cut -b -7 <<< %{gittag})
-%global user		stp
-
 Name:		stp
-Version:	2.3.1
-Release:	5.%{gitdate}git.%{shorttag}%{?dist}
+Version:	2.3.3
+Release:	1%{?dist}
 Summary:	Constraint solver/decision procedure
 
 License:	MIT
 URL:		http://stp.github.io/
-Source0:	https://github.com/%{user}/%{name}/tarball/%{gittag}/%{user}-%{name}-%{shorttag}.tar.gz
+Source0:	https://github.com/stp/stp/archive/%{version}/%{name}-%{version}.tar.gz
 # Fix some format specifier problems
 Patch0:         %{name}-format.patch
 
@@ -70,15 +63,11 @@ Provides:       python2-%{name} = %{version}-%{release}
 Python 3 interface to STP.
 
 %prep
-%setup -q -n %{user}-%{name}-%{shorttag}
-%patch0
+%autosetup -p0
 
 # We do not want to know about the order of member initializers
 sed -i "s/-Wno-deprecated/-Wno-reorder/" CMakeLists.txt
 
-# Do not override our debug settings
-sed -i '/ggdb3/d' CMakeLists.txt
-
 # Prevent a clash between minisat and cryptominisat5 definitions
 sed '/SATSolver.h/a#undef var_Undef\n#undef l_True\n#undef l_False\n#undef l_Undef' \
     -i.orig include/stp/Sat/CryptoMinisat5.h
@@ -88,7 +77,6 @@ rm -f include/stp/Sat/CryptoMinisat5.h.orig
 %build
 export CFLAGS="%{optflags} -I %{_includedir}/minisat"
 export CXXFLAGS="%{optflags} -I %{_includedir}/minisat"
-export LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS"
 %cmake -DPYTHON_EXECUTABLE:FILEPATH=%{_bindir}/python%{python3_version} \
        -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python3_version}.so \
        -DPYTHON_INCLUDE_DIR:FILEPATH=%{_includedir}/python%{python3_version} .
@@ -118,6 +106,9 @@ mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}/man
 %{python3_sitelib}/%{name}/
 
 %changelog
+* Wed Apr 17 2019 Jerry James <loganjerry@gmail.com> - 2.3.3-1
+- New upstream version
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-5.20181115git.d7d6530
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild