From 3b75c4ce150830113e03adff803ca6e661f4e2bc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 14 2021 18:37:47 +0000 Subject: Version 1.4.0. --- diff --git a/.gitignore b/.gitignore index 693f725..6fcd425 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rel-*.tar.gz /sr19.tar.gz +/cadical-*.tar.gz diff --git a/cadical-shared.patch b/cadical-shared.patch index 33ebd7c..e705165 100644 --- a/cadical-shared.patch +++ b/cadical-shared.patch @@ -1,14 +1,14 @@ ---- makefile.in.orig 2020-06-11 03:43:16.000000000 -0600 -+++ makefile.in 2020-06-11 16:52:50.668103226 -0600 +--- makefile.in.orig 2021-02-14 00:39:29.000000000 -0700 ++++ makefile.in 2021-02-14 10:24:29.599153782 -0700 @@ -9,6 +9,7 @@ CXX=@CXX@ CXXFLAGS=@CXXFLAGS@ +LDFLAGS=@LDFLAGS@ - # Mainly used for parallel build ('-j' option to 'configure') - -@@ -28,7 +29,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) + ############################################################################ + # It is usually not necessary to change anything below this line! # +@@ -24,7 +25,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) #--------------------------------------------------------------------------# @@ -17,7 +17,7 @@ #--------------------------------------------------------------------------# -@@ -42,11 +43,17 @@ all: libcadical.a cadical mobical +@@ -38,11 +39,17 @@ all: libcadical.a cadical mobical # Application binaries (the stand alone solver 'cadical' and the model based # tester 'mobical') and the library are the main build targets. @@ -39,8 +39,8 @@ libcadical.a: $(OBJ) makefile ar rc $@ $(OBJ) ---- test/api/run.sh.orig 2020-06-11 03:43:16.000000000 -0600 -+++ test/api/run.sh 2020-06-11 16:52:50.669103226 -0600 +--- test/api/run.sh.orig 2021-02-14 00:39:29.000000000 -0700 ++++ test/api/run.sh 2021-02-14 10:24:29.600153780 -0700 @@ -28,8 +28,8 @@ die "needs to be called from a top-level [ -f "$CADICALBUILD/makefile" ] || \ die "can not find '$CADICALBUILD/makefile' (run 'configure' first)" diff --git a/cadical.spec b/cadical.spec index 43a52fa..f58c72c 100644 --- a/cadical.spec +++ b/cadical.spec @@ -1,12 +1,12 @@ Name: cadical Epoch: 1 -Version: 1.3.0 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Simplified SAT solver License: MIT URL: http://fmv.jku.at/cadical/ -Source0: https://github.com/arminbiere/%{name}/archive/rel-%{version}.tar.gz +Source0: https://github.com/arminbiere/%{name}/archive/rel-%{version}/%{name}-%{version}.tar.gz # Fedora-only patch: build a shared library instead of a static library Patch0: %{name}-shared.patch @@ -49,7 +49,7 @@ sed -i '/^-e/s/,/|/g;s/ -O3/ -O2/' configure %build # The configure script is NOT generated by autoconf. Do NOT use the # %%configure macro here. -CXXFLAGS="%{optflags} -fPIC" ./configure %{?_smp_mflags} +CXXFLAGS="%{optflags} -fPIC" ./configure sed -i "s|@LDFLAGS@|$RPM_LD_FLAGS|" build/makefile %make_build @@ -107,6 +107,9 @@ make -C test %{_libdir}/lib%{name}.so %changelog +* Sun Feb 14 2021 Jerry James - 1:1.4.0-1 +- Version 1.4.0 + * Tue Jan 26 2021 Fedora Release Engineering - 1:1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index ff8b6cb..05ffa23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rel-1.3.0.tar.gz) = 949f7aedeef751e931f08c782d89967134ae930feaf313386b9ad77f16c1988a8beba7d7ba59a6a9531b55521f03e02e29732dffff40c40c2a3e62c5ff719be4 +SHA512 (cadical-1.4.0.tar.gz) = 323211f688c79bfde50ad5e2678bf7f74b497d29d3d58fea0176a4770f4ad12df6c3f3cfc8cba07e6ba68ea138f3f1f795642eac44dbeff7d5229169a566b606