Hello community, here is the log from the commit of package minisat for openSUSE:Factory checked in at 2020-11-11 20:48:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minisat (Old) and /work/SRC/openSUSE:Factory/.minisat.new.26437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minisat" Wed Nov 11 20:48:05 2020 rev:4 rq:847751 version:2.2.1+20200902 Changes: -------- --- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2019-11-04 17:16:31.932910189 +0100 +++ /work/SRC/openSUSE:Factory/.minisat.new.26437/minisat.changes 2020-11-11 20:48:10.315747266 +0100 @@ -1,0 +2,16 @@ +Wed Nov 04 09:03:48 UTC 2020 - [email protected] + +- Update to version 2.2.1+20200902: + * Fixing exported definitions + * Adding uninstall capability + * Revert "CMakeLists: support different lib dirs" + * Removing second STATICCOMPILE + * CMakeLists: support different lib dirs + * Updating to fix build + * Export minisat project for other cmake builds + * Fixing static vs. dynamic compile + * Quell some clang warnings +- switch to obs_scm +- drop 0001-CMakeLists-make-static-lib-optional.patch (in upstream) + +------------------------------------------------------------------- Old: ---- 0001-CMakeLists-make-static-lib-optional.patch minisat-2.2.1+20180702.tar.xz New: ---- minisat-2.2.1+20200902.obscpio minisat.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minisat.spec ++++++ --- /var/tmp/diff_new_pack.ibnZDj/_old 2020-11-11 20:48:11.183748080 +0100 +++ /var/tmp/diff_new_pack.ibnZDj/_new 2020-11-11 20:48:11.187748084 +0100 @@ -1,7 +1,7 @@ # # spec file for package minisat # -# 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,15 +17,14 @@ Name: minisat -Url: http://minisat.se/MiniSat.html -Version: 2.2.1+20180702 +URL: http://minisat.se/MiniSat.html +Version: 2.2.1+20200902 Release: 0 Summary: SAT solver License: MIT Group: Development/Tools/Other Source0: %{name}-%{version}.tar.xz Patch0: 0001-CMakeLists-support-different-lib-dirs.patch -Patch1: 0001-CMakeLists-make-static-lib-optional.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -68,7 +67,7 @@ %build %define __builder ninja -%cmake -DSTATIC_BINARIES=OFF +%cmake -DMINISAT_INSTALL_CMAKE_DIR=%{_libdir}/cmake/%{name} %make_jobs %install @@ -78,18 +77,17 @@ %postun -n libminisat2 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc LICENSE README +%doc README +%license LICENSE %{_bindir}/%{name} %{_bindir}/%{name}_core %files -n libminisat2 -%defattr(-,root,root) %{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root) %{_includedir}/%{name}/ +%{_libdir}/cmake/%{name} %{_libdir}/lib%{name}.so %changelog ++++++ 0001-CMakeLists-support-different-lib-dirs.patch ++++++ --- /var/tmp/diff_new_pack.ibnZDj/_old 2020-11-11 20:48:11.207748103 +0100 +++ /var/tmp/diff_new_pack.ibnZDj/_new 2020-11-11 20:48:11.207748103 +0100 @@ -1,4 +1,4 @@ -From c65ff70c7f62ca918458cacd7b3f7b5b61a2846b Mon Sep 17 00:00:00 2001 +From f6d76981b1b31a389c30239e0b10332ddacceccf Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 4 Nov 2019 09:56:20 +0100 Subject: [PATCH] CMakeLists: support different lib dirs @@ -11,16 +11,17 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 061a61a..6e00ca0 100644 +index 465fd913..10c8bf08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,10 +80,12 @@ set_target_properties(minisat_simp PROPERTIES OUTPUT_NAME "minisat") +@@ -220,11 +220,13 @@ set_target_properties(minisat_simp PROPERTIES OUTPUT_NAME "minisat") #-------------------------------------------------------------------------------------------------- # Installation targets: +set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Output directory for libraries") + - install(TARGETS minisat-lib-static minisat-lib-shared minisat_core minisat_simp + install(TARGETS minisat minisat_core minisat_simp + EXPORT ${MINISAT_EXPORT_NAME} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) @@ -30,5 +31,5 @@ install(DIRECTORY minisat/mtl minisat/utils minisat/core minisat/simp DESTINATION include/minisat -- -2.23.0 +2.26.2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ibnZDj/_old 2020-11-11 20:48:11.231748125 +0100 +++ /var/tmp/diff_new_pack.ibnZDj/_new 2020-11-11 20:48:11.231748125 +0100 @@ -1,5 +1,5 @@ <services> - <service mode="disabled" name="tar_scm"> + <service mode="disabled" name="obs_scm"> <param name="url">git://github.com/stp/minisat.git</param> <param name="scm">git</param> <param name="filename">minisat</param> @@ -8,9 +8,12 @@ <param name="versionrewrite-pattern">releases/(.*)</param> <param name="versionrewrite-replacement">\1</param> </service> - <service mode="disabled" name="recompress"> - <param name="file">*.tar</param> + <service mode="disabled" name="set_version"/> + + <service name="tar" mode="buildtime"/> + <service name="recompress" mode="buildtime"> + <param name="file">minisat-*.tar</param> <param name="compression">xz</param> </service> - <service mode="disabled" name="set_version"/> + </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ibnZDj/_old 2020-11-11 20:48:11.255748148 +0100 +++ /var/tmp/diff_new_pack.ibnZDj/_new 2020-11-11 20:48:11.255748148 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/stp/minisat.git</param> - <param name="changesrevision">1aa1e871aad1fe2f80510b42e93f28d4fb1286a0</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">37158a35c62d448b3feccfa83006266e12e5acb7</param></service></servicedata> \ No newline at end of file ++++++ minisat.obsinfo ++++++ name: minisat version: 2.2.1+20200902 mtime: 1599078718 commit: 37158a35c62d448b3feccfa83006266e12e5acb7 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
