Hello community, here is the log from the commit of package stp for openSUSE:Factory checked in at 2020-01-09 22:52:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stp (Old) and /work/SRC/openSUSE:Factory/.stp.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stp" Thu Jan 9 22:52:57 2020 rev:6 rq:762244 version:2.3.3+20190713 Changes: -------- --- /work/SRC/openSUSE:Factory/stp/stp.changes 2019-08-07 14:01:20.956852914 +0200 +++ /work/SRC/openSUSE:Factory/.stp.new.6675/stp.changes 2020-01-09 22:53:35.770799412 +0100 @@ -1,0 +2,12 @@ +Thu Jan 9 14:11:38 UTC 2020 - Martin Pluskal <[email protected]> + +- Python3 bindings subpackage should be named correctly +- More modern cmake macros + +------------------------------------------------------------------- +Thu Jan 9 12:25:51 UTC 2020 - Ondřej Súkup <[email protected]> + +- build python3 bindings + patch py3.patch +- drop dependecy on python devel .. not needed + +------------------------------------------------------------------- New: ---- py3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stp.spec ++++++ --- /var/tmp/diff_new_pack.9rUi0u/_old 2020-01-09 22:53:36.522799789 +0100 +++ /var/tmp/diff_new_pack.9rUi0u/_new 2020-01-09 22:53:36.526799791 +0100 @@ -1,7 +1,7 @@ # # spec file for package stp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,23 @@ %define sover 2_3 - Name: stp +Version: 2.3.3+20190713 +Release: 0 +Summary: Constraint Solver +License: MIT +URL: https://github.com/stp/stp/wiki +Source0: %{name}-%{version}.tar.xz +Patch0: py3.patch BuildRequires: bison -%if 0%{?suse_version} > 1320 -BuildRequires: libboost_program_options-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: cmake BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: libboost_program_options-devel BuildRequires: minisat-devel BuildRequires: ninja -BuildRequires: python-devel +BuildRequires: python3-base BuildRequires: xz -Summary: Constraint Solver -License: MIT -Group: Productivity/Scientific/Other -Version: 2.3.3+20190713 -Release: 0 -Url: https://github.com/stp/stp/wiki -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.xz %description STP is an efficient decision procedure for the validity (or satisfiability) of @@ -53,7 +47,6 @@ %package -n libstp%{sover} Summary: Constraint Solver -Group: System/Libraries %description -n libstp%{sover} STP is an efficient decision procedure for the validity (or satisfiability) of @@ -67,29 +60,28 @@ %package devel Summary: Devel files for stp -Group: Development/Languages/C and C++ Requires: %{name} = %{version} +Requires: libstp%{sover} = %{version} +Requires: minisat-devel %if 0%{?suse_version} > 1320 Requires: libboost_program_options-devel %else Requires: boost-devel %endif -Requires: libstp%{sover} = %{version} -Requires: minisat-devel %description devel Developmnet files for stp library. -%package python +%package -n python3-stp Summary: Python bindings for stp -Group: Development/Languages/Python -Requires: %{name} = %{version} +Requires: libstp%{sover} = %{version} -%description python +%description -n python3-stp Python bindings for stp library. %prep %setup -q +%patch0 -p1 %build %define __builder ninja @@ -97,19 +89,18 @@ -DBUILD_SHARED_LIBS:BOOL="on" \ -DALSO_BUILD_STATIC_LIB:BOOL="off" \ -DSTP_TIMESTAMPS:BOOL="off" -%make_jobs +%cmake_build %install %cmake_install -%__install -d %{buildroot}/%{_docdir}/%{name}/example -%__install -m 644 -t %{buildroot}/%{_docdir}/%{name}/example examples/simple/* +install -d %{buildroot}/%{_docdir}/%{name}/example +install -m 644 -t %{buildroot}/%{_docdir}/%{name}/example examples/simple/* %post -n libstp%{sover} -p /sbin/ldconfig %postun -n libstp%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS README.markdown %license LICENSE %{_bindir}/stp* @@ -119,7 +110,6 @@ %{_libdir}/libstp.so.* %files devel -%defattr(-,root,root) %dir %{_includedir}/stp/ %{_includedir}/stp/*.h %dir %{_libdir}/cmake/ @@ -127,8 +117,7 @@ %{_libdir}/cmake/STP/ %{_docdir}/%{name}/example/ -%files python -%defattr(-,root,root) -%{python_sitelib}/* +%files -n python3-stp +%{python3_sitelib}/* %changelog ++++++ py3.patch ++++++ Index: stp-2.3.3+20190713/CMakeLists.txt =================================================================== --- stp-2.3.3+20190713.orig/CMakeLists.txt +++ stp-2.3.3+20190713/CMakeLists.txt @@ -607,15 +607,11 @@ option(ENABLE_TESTING "Enable testing" O # try finding python if the user did not explicitly said that # he/she does not want python bindings if ((NOT DEFINED ENABLE_PYTHON_INTERFACE) OR ENABLE_PYTHON_INTERFACE) - find_package (PythonInterp 2.7) - find_package (PythonLibs 2.7) - if (PYTHON_EXECUTABLE AND PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR) + find_package (PythonInterp) + if (PYTHON_EXECUTABLE) message(STATUS "PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}") - message(STATUS "PYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}") - message(STATUS "PYTHON_INCLUDE_DIR:FILEPATH=${PYTHON_INCLUDE_DIR}") - message(STATUS "PYTHONLIBS_VERSION_STRING=${PYTHONLIBS_VERSION_STRING}") set(PYTHON_OK ON) - message(STATUS "OK, found python interpreter, libs and header files") + message(STATUS "OK, found python interpreter") else() message(WARNING "Cannot find python interpreter, libs and header files, cannot build python interface") endif() Index: stp-2.3.3+20190713/bindings/python/stp/library_path.py.in_install =================================================================== --- stp-2.3.3+20190713.orig/bindings/python/stp/library_path.py.in_install +++ stp-2.3.3+20190713/bindings/python/stp/library_path.py.in_install @@ -28,6 +28,5 @@ # Search paths for the stp shared library PATHS = [ - '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/@LIBSTP_FILENAME@', - '@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/@LIBSTP_FILENAME@' + '@CMAKE_INSTALL_LIBDIR@/@[email protected]' ] Index: stp-2.3.3+20190713/bindings/python/stp/stp.py.in =================================================================== --- stp-2.3.3+20190713.orig/bindings/python/stp/stp.py.in +++ stp-2.3.3+20190713/bindings/python/stp/stp.py.in @@ -42,7 +42,7 @@ Py3 = sys.version_info >= (3, 0, 0) if Py3: long = int -from library_path import PATHS +from .library_path import PATHS for path in PATHS: if not os.path.exists(path):
