commit minisat for openSUSE:Factory
Hello community,
here is the log from the commit of package minisat for openSUSE:Factory checked
in at 2019-11-04 17:16:18
Comparing /work/SRC/openSUSE:Factory/minisat (Old)
and /work/SRC/openSUSE:Factory/.minisat.new.2990 (New)
Package is "minisat"
Mon Nov 4 17:16:18 2019 rev:3 rq:745123 version:2.2.1+20180702
Changes:
--- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2019-07-31
14:36:25.289865450 +0200
+++ /work/SRC/openSUSE:Factory/.minisat.new.2990/minisat.changes
2019-11-04 17:16:31.932910189 +0100
@@ -1,0 +2,16 @@
+Mon Nov 04 08:39:23 UTC 2019 - jsl...@suse.com
+
+- Update to version 2.2.1+20180702:
+ * Fix linking of minisat as dependency library on MacOSX
+ * fixed GCC 6.3 warning: invalid suffix on literal; C++11 requires a space
between literal and string macro [-Wliteral-suffix]
+ * Specify default argument in the declaration not the friend declaration
+ * Fix declaration of Minisat::memUsedPeak for non-Linux systems
+ * Remove illegal (and not neccesary) friend definition to fix compilation
under clang.
+ * Fixing problems with compilation with C++11 compilers
+- switch to cmake
+ * add 0001-CMakeLists-support-different-lib-dirs.patch
+ * add 0001-CMakeLists-make-static-lib-optional.patch
+- remove friend-declaration.patch (in upstream now)
+- remove Makefile_lib_rule.patch (not needed -- cmake)
+
+---
Old:
Makefile_lib_rule.patch
friend-declaration.patch
minisat-2.2.0+20130925.tar.xz
New:
0001-CMakeLists-make-static-lib-optional.patch
0001-CMakeLists-support-different-lib-dirs.patch
_servicedata
minisat-2.2.1+20180702.tar.xz
Other differences:
--
++ minisat.spec ++
--- /var/tmp/diff_new_pack.SowOtQ/_old 2019-11-04 17:16:33.476911838 +0100
+++ /var/tmp/diff_new_pack.SowOtQ/_new 2019-11-04 17:16:33.508911873 +0100
@@ -1,7 +1,7 @@
#
# spec file for package minisat
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: minisat
Url:http://minisat.se/MiniSat.html
-Version:2.2.0+20130925
+Version:2.2.1+20180702
Release:0
Summary:SAT solver
License:MIT
Group: Development/Tools/Other
Source0:%{name}-%{version}.tar.xz
-Patch0: Makefile_lib_rule.patch
-Patch1: friend-declaration.patch
+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++
+BuildRequires: ninja
BuildRequires: zlib-devel
%description
@@ -62,27 +64,15 @@
Headers and libraries for the minisat package.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%build
-export CXXFLAGS="%optflags"
-make %{?_smp_mflags} sh lsh \
- MINISAT_REL="-D NDEBUG" \
- VERB=
+%define __builder ninja
+%cmake -DSTATIC_BINARIES=OFF
+%make_jobs
%install
-make DESTDIR=%{buildroot} prefix=%{_prefix} install-headers
-
-# lib
-install -d %{buildroot}/%{_libdir}
-# links
-cp -dp build/dynamic/lib/libminisat.so* %{buildroot}/%{_libdir}/
-
-# binaries
-install -d %{buildroot}/%{_bindir}
-install -m 0755 build/dynamic/bin/%{name} %{buildroot}/%{_bindir}/%{name}
+%cmake_install
%post -n libminisat2 -p /sbin/ldconfig
%postun -n libminisat2 -p /sbin/ldconfig
@@ -91,6 +81,7 @@
%defattr(-,root,root)
%doc LICENSE README
%{_bindir}/%{name}
+%{_bindir}/%{name}_core
%files -n libminisat2
%defattr(-,root,root)
++ 0001-CMakeLists-make-static-lib-optional.patch ++
>From 295a4a7586cc1f4f867a92c864cc1c49eab0991c Mon Sep 17 00:00:00 2001
From: Jiri Slaby
Date: Mon, 4 Nov 2019 10:00:37 +0100
Subject: [PATCH] CMakeLists: make static lib optional
Build static lib only if BUILD_STATIC_LIBS is specified.
---
CMakeLists.txt | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e00ca0..5e493de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ project(minisat)
# Configurable options:
option(STATIC_BINARIES "Link binaries statically." ON)
+option(BUILD_STATIC_LIBS "Build static library." ON)
commit minisat for openSUSE:Factory
Hello community,
here is the log from the commit of package minisat for openSUSE:Factory checked
in at 2019-07-31 14:36:23
Comparing /work/SRC/openSUSE:Factory/minisat (Old)
and /work/SRC/openSUSE:Factory/.minisat.new.4126 (New)
Package is "minisat"
Wed Jul 31 14:36:23 2019 rev:2 rq:719993 version:2.2.0+20130925
Changes:
--- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2017-03-10
21:45:57.597391776 +0100
+++ /work/SRC/openSUSE:Factory/.minisat.new.4126/minisat.changes
2019-07-31 14:36:25.289865450 +0200
@@ -1,0 +2,6 @@
+Mon Jul 29 01:10:45 UTC 2019 - Simon Puchert
+
+- Add friend-declaration.patch:
+ * Fix the illegal friend declaration that caused a build failure.
+
+---
New:
friend-declaration.patch
Other differences:
--
++ minisat.spec ++
--- /var/tmp/diff_new_pack.x6FQBV/_old 2019-07-31 14:36:26.201864984 +0200
+++ /var/tmp/diff_new_pack.x6FQBV/_new 2019-07-31 14:36:26.201864984 +0200
@@ -25,6 +25,7 @@
Group: Development/Tools/Other
Source0:%{name}-%{version}.tar.xz
Patch0: Makefile_lib_rule.patch
+Patch1: friend-declaration.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: zlib-devel
@@ -63,6 +64,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CXXFLAGS="%optflags"
++ friend-declaration.patch ++
diff -Nur
minisat-2.2.0+20130925/minisat-2.2.0+20130925/minisat/core/SolverTypes.h
minisat-2.2.0+20130925-p/minisat-2.2.0+20130925/minisat/core/SolverTypes.h
--- a/minisat/core/SolverTypes.h2013-09-25 14:16:18.0 +0200
+++ b/minisat/core/SolverTypes.h2019-07-29 02:55:41.499558102 +0200
@@ -52,7 +52,7 @@
int x;
// Use this as a constructor:
-friend Lit mkLit(Var var, bool sign = false);
+friend Lit mkLit(Var var, bool sign);
bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -60,7 +60,7 @@
};
-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var +
(int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var +
(int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned
int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }
commit minisat for openSUSE:Factory
Hello community,
here is the log from the commit of package minisat for openSUSE:Factory checked
in at 2017-03-10 21:45:57
Comparing /work/SRC/openSUSE:Factory/minisat (Old)
and /work/SRC/openSUSE:Factory/.minisat.new (New)
Package is "minisat"
Fri Mar 10 21:45:57 2017 rev:1 rq:458670 version:2.2.0+20130925
Changes:
New Changes file:
--- /dev/null 2017-03-01 00:40:19.279048016 +0100
+++ /work/SRC/openSUSE:Factory/.minisat.new/minisat.changes 2017-03-10
21:45:57.597391776 +0100
@@ -0,0 +1,37 @@
+---
+Fri Feb 17 11:47:53 UTC 2017 - jsl...@suse.com
+
+- make the version the same as for stp, klee and others
+
+---
+Thu Feb 16 12:58:57 UTC 2017 - mplus...@suse.com
+
+- Adjust _service
+
+---
+Thu Feb 16 08:52:46 UTC 2017 - jeng...@inai.de
+
+- Trim description
+- Use version numbers based on those used by upstream
+
+---
+Thu Oct 15 10:00:40 UTC 2015 - jsl...@suse.com
+
+- add LICENSE and README
+
+---
+Fri Oct 9 12:19:51 UTC 2015 - jsl...@suse.com
+
+- add Makefile_lib_rule.patch: fix parallel build
+
+---
+Tue Apr 14 12:30:42 UTC 2015 - jsl...@suse.com
+
+- switch to the git version
+- update to 20130925
+
+---
+Thu Mar 19 15:33:00 UTC 2015 - jsl...@suse.com
+
+- initial package
+
New:
Makefile_lib_rule.patch
_service
minisat-2.2.0+20130925.tar.xz
minisat.changes
minisat.spec
Other differences:
--
++ minisat.spec ++
#
# spec file for package minisat
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: minisat
Url:http://minisat.se/MiniSat.html
Version:2.2.0+20130925
Release:0
Summary:SAT solver
License:MIT
Group: Development/Tools/Other
Source0:%{name}-%{version}.tar.xz
Patch0: Makefile_lib_rule.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: zlib-devel
%description
MiniSat is a comparatively small SAT solver with documentation
(through the following paper). The first version was just above 600
lines while containing many then-desirable features (conflict-clause
recording, conflict-driven backjumping, VSIDS dynamic variable order,
two-literal watch scheme), and even extensions for incremental SAT
and for non-clausal constraints over boolean variables.
The current MiniSat v2 supports variable elimination style
simplification, too.
%package -n libminisat2
Summary:SAT solver
Group: System/Libraries
%description -n libminisat2
MiniSat is a comparatively small SAT solver. It can do
conflict-clause recording, conflict-driven backjumping, VSIDS dynamic
variable order, two-literal watch scheme, non-clausal constraints
over boolean variables, and variable elimination style
simplification.
%package devel
Summary:Devel files for minisat
Group: Development/Libraries/C and C++
Requires: libminisat2 = %{version}
Requires: zlib-devel
%description devel
Headers and libraries for the minisat package.
%prep
%setup -q
%patch0 -p1
%build
export CXXFLAGS="%optflags"
make %{?_smp_mflags} sh lsh \
MINISAT_REL="-D NDEBUG" \
VERB=
%install
make DESTDIR=%{buildroot} prefix=%{_prefix} install-headers
# lib
install -d %{buildroot}/%{_libdir}
# links
cp -dp build/dynamic/lib/libminisat.so* %{buildroot}/%{_libdir}/
# binaries
install -d %{buildroot}/%{_bindir}
install -m 0755 build/dynamic/bin/%{name} %{buildroot}/%{_bindir}/%{name}
%post -n libminisat2 -p /sbin/ldconfig
%postun -n libminisat2 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc LICENSE README
%{_bindir}/%{name}
%files -n libminisat2
%defattr(-,root,root)
%{_libdir}/lib%{name}.so.*
%files devel
%defattr(-,root,root)
