Notification time stamped 2019-06-30 23:06:00 UTC
From 36bf3f14b19ecaf51e860a57d0dd37ac5d0547ef Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Jun 30 2019 23:05:48 +0000
Subject: New upstream version.
---
diff --git a/.gitignore b/.gitignore
index e63ff09..693f725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/rel-06w.tar.gz
+/rel-*.tar.gz
/sr19.tar.gz
diff --git a/cadical-32bit.patch b/cadical-32bit.patch
index 88b7e58..418b4d3 100644
--- a/cadical-32bit.patch
+++ b/cadical-32bit.patch
@@ -1,6 +1,6 @@
---- src/analyze.cpp.orig 2019-06-06 00:37:51.000000000 -0600
-+++ src/analyze.cpp 2019-06-12 20:24:52.020342137 -0600
-@@ -281,9 +281,9 @@ void Internal::clear_analyzed_levels ()
+--- src/analyze.cpp.orig 2019-06-16 06:56:32.000000000 -0600
++++ src/analyze.cpp 2019-06-30 16:20:00.887136296 -0600
+@@ -280,9 +280,9 @@ void Internal::clear_analyzed_levels ()
struct analyze_trail_negative_rank {
Internal * internal;
analyze_trail_negative_rank (Internal * s) : internal (s) { }
@@ -12,14 +12,3 @@
res <<= 32;
res |= v.trail;
return ~res;
---- src/checker.cpp.orig 2019-06-06 00:37:51.000000000 -0600
-+++ src/checker.cpp 2019-06-12 20:26:14.590255234 -0600
-@@ -514,7 +514,7 @@ void Checker::delete_clause (const vecto
- garbage = d;
- d->size = 0;
- // If there are enough garbage clauses collect them.
-- if (num_garbage > 0.5 * max (size_clauses, (size_t) size_vars))
-+ if (num_garbage > 0.5 * max (size_clauses, (uint64_t) size_vars))
- collect_garbage_clauses ();
- } else {
- internal->fatal_message_start ();
diff --git a/cadical.spec b/cadical.spec
index 8a0ad0f..66a7728 100644
--- a/cadical.spec
+++ b/cadical.spec
@@ -1,16 +1,11 @@
-# I do not understand upstream's versioning scheme. Starting with version
-# sr19, we revert to version 0 and use the release field to enforce proper
-# update ordering.
-%global upver sr19
-
Name: cadical
-Version: 0
-Release: 1.%{upver}%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: Simplified SAT solver
License: MIT
URL:
http://fmv.jku.at/cadical/
-Source0:
https://github.com/arminbiere/%{name}/archive/%{upver}.tar.gz
+Source0:
https://github.com/arminbiere/%{name}/archive/rel-%{version}.tar.gz
# Fedora-only patch: build a shared library instead of a static library
Patch0: %{name}-shared.patch
# Fix building on 32-bit platforms
@@ -48,7 +43,7 @@ Library links and header files for developing applications that use
%{name}.
%prep
-%autosetup -p0 -n %{name}-%{upver}
+%autosetup -p0 -n %{name}-rel-%{version}
# We have commas in optflags, so commas can't be used as sed delimiters in
# the configure script. Also, do not override our build flags.
@@ -62,8 +57,8 @@ CXXFLAGS="%{optflags} -fPIC" ./configure
# Make man pages for the command line interface
export LD_LIBRARY_PATH=$PWD/build
-help2man --version-string=%{upver} -N -o cadical.1 build/cadical
-help2man --version-string=%{upver} -N -o mobical.1 -h -h build/mobical
+help2man --version-string=%{version} -N -o cadical.1 build/cadical
+help2man --version-string=%{version} -N -o mobical.1 -h -h build/mobical
%install
# The makefile has no install target. Install by hand.
@@ -112,6 +107,9 @@ make -C test
%{_libdir}/lib%{name}.so
%changelog
+* Sat Jun 29 2019 Jerry James <loganjerry(a)gmail.com> - 1.0.0-1
+- New upstream version
+
* Wed Jun 12 2019 Jerry James <loganjerry(a)gmail.com> - 0-1.sr19
- New upstream version
- Adapt to upstream version scheme
diff --git a/sources b/sources
index cdd427f..a27c67e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sr19.tar.gz) =
e6655562dd9d6344d2e292bff4d199d1d2d3ec69e21338294a5347338e7fcfd2896e4dc800ddd6bc35019499a867053cb1d4dccd02ce4e8ca6531f4c4665ce98
+SHA512 (rel-1.0.0.tar.gz) =
45ca4fd0efda6b0560bdfb4e827101df06a2186acaf3cb70465d4ab69b9c9bdbbc5b0b70d7ac6ea8339a045ea7600915b8753dd2c3fcee6a9a23c5372ad5a0bc
https://src.fedoraproject.org/rpms/cadical/c/36bf3f14b19ecaf51e860a57d0dd...