Update to recent git snapshot. Drop the python2 subpackage (bz 1634557).
This commit is contained in:
Jerry James
parent
258e5ceb36
commit
baa8e4ef1f
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (stp-stp-c68788e.tar.gz) = 4027e284e6e6fda0c323c68f44bbf4567d49d458ccb56cc3462939ae10d647dae7803b9c9b0cf4d7d63bba0c7a4a680d42a7a9b62719e8d65f2a353a197c97a9
|
||||
SHA512 (stp-stp-d7d6530.tar.gz) = 5f34164d068c263cd33271368903e499870afa932c806a6f3cb32713d97b751748bbe35f1a604d8aa1547ad9ce59433587ca2112eeeeb2b7a8268bbfa3819087
|
||||
|
|
|
|||
52
stp.spec
52
stp.spec
|
|
@ -1,13 +1,13 @@
|
|||
# Upstream occasionally releases a git snapshot, but no "regular" releases
|
||||
# since the 0.1 release.
|
||||
%global gitdate 20180607
|
||||
%global gittag c68788eb05731ae08e4f730a6b1c93803620e2b9
|
||||
%global gitdate 20181115
|
||||
%global gittag d7d65301f6cbe381004bad09a141dcea8632caff
|
||||
%global shorttag %(cut -b -7 <<< %{gittag})
|
||||
%global user stp
|
||||
|
||||
Name: stp
|
||||
Version: 2.3.1
|
||||
Release: 3.%{gitdate}git.%{shorttag}%{?dist}
|
||||
Release: 4.%{gitdate}git.%{shorttag}%{?dist}
|
||||
Summary: Constraint solver/decision procedure
|
||||
|
||||
License: MIT
|
||||
|
|
@ -22,10 +22,10 @@ BuildRequires: cmake
|
|||
BuildRequires: cryptominisat
|
||||
BuildRequires: cryptominisat-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: help2man
|
||||
BuildRequires: minisat2-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: perl(Getopt::Long)
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python3-devel
|
||||
|
||||
%description
|
||||
|
|
@ -55,16 +55,6 @@ Development files for the STP (Simple Theorem Prover),
|
|||
a constraint solver (also referred to as a decision procedure
|
||||
or automated prover). Provides a static library.
|
||||
|
||||
%package -n python2-%{name}
|
||||
Summary: Python 2 interface to STP
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
%description -n python2-%{name}
|
||||
Python 2 interface to STP.
|
||||
|
||||
%package -n python3-%{name}
|
||||
Summary: Python 3 interface to STP
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -72,6 +62,10 @@ BuildArch: noarch
|
|||
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
|
||||
# This can be removed once F29 reaches EOL
|
||||
Obsoletes: python2-%{name} < 2.3.1-4
|
||||
Provides: python2-%{name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{name}
|
||||
Python 3 interface to STP.
|
||||
|
||||
|
|
@ -82,43 +76,36 @@ Python 3 interface to STP.
|
|||
# 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
|
||||
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"
|
||||
export LDFLAGS="-Wl,--as-needed $RPM_LD_FLAGS"
|
||||
%cmake
|
||||
# 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}
|
||||
# FIXME: %%{?_smp_mflags} doesn't work due to running genkinds.pl too late
|
||||
make
|
||||
popd
|
||||
|
||||
%install
|
||||
# Install the python 3 version
|
||||
pushd ../python3
|
||||
make install DESTDIR=%{buildroot}
|
||||
popd
|
||||
|
||||
# Install the python 2 version
|
||||
make install DESTDIR=%{buildroot}
|
||||
# Fix the location of the man page
|
||||
mkdir -p %{buildroot}%{_datadir}
|
||||
mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}/man
|
||||
|
||||
%files
|
||||
%{_bindir}/*
|
||||
%{_libdir}/libstp.so.*
|
||||
%{_mandir}/man1/stp.1*
|
||||
%doc AUTHORS README.markdown papers
|
||||
%license LICENSE LICENSE_COMPONENTS
|
||||
|
||||
|
|
@ -127,13 +114,14 @@ make install DESTDIR=%{buildroot}
|
|||
%{_libdir}/cmake/STP/
|
||||
%{_libdir}/libstp.so
|
||||
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitelib}/%{name}/
|
||||
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitelib}/%{name}/
|
||||
|
||||
%changelog
|
||||
* Thu Nov 22 2018 Jerry James <loganjerry@gmail.com> - 2.3.1-4.20181115git.d7d6530
|
||||
- Update to recent git snapshot
|
||||
- Drop the python2 subpackage (bz 1634557)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3.20180607git.c68788e
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue