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) %{_includedir}/%{name}/ %{_libdir}/lib%{name}.so %changelog ++++++ Makefile_lib_rule.patch ++++++ Subject: Makefile: fix lib rule From: Jiri Slaby <jsl...@suse.cz> When the rule for dynamic library is run in parallel, it can overwrite one file multiple times resulting in errors like: build/dynamic/lib/libminisat.so: file not recognized: File format not recognized Fix it by splitting and making an explicit dependency. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/Makefile +++ b/Makefile @@ -157,13 +157,15 @@ $(BUILD_DIR)/release/bin/$(MINISAT_CORE) $(VERB) $(AR) -rcs $@ $^ ## Shared Library rule -$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE)\ - $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR)\ - $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB): +$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE): $(ECHO) Linking Shared Library: $@ $(VERB) mkdir -p $(dir $@) $(VERB) $(CXX) $(MINISAT_LDFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(MINISAT_DLIB).$(SOMAJOR) $^ + +$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR): $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE) $(VERB) ln -sf $(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE) $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR) + +$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB): $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR) $(VERB) ln -sf $(MINISAT_DLIB).$(SOMAJOR) $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB) install: install-headers install-lib install-bin ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://github.com/niklasso/minisat.git</param> <param name="scm">git</param> <param name="revision">master</param> <param name="filename">minisat</param> <param name="parent-tag">releases/2.2.0</param> <param name="versionformat">2.2.0+%cd</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services>
