diff --git a/cadical-shared.patch b/cadical-shared.patch index 89a32ae..38507d2 100644 --- a/cadical-shared.patch +++ b/cadical-shared.patch @@ -1,6 +1,14 @@ ---- makefile.in.orig 2019-07-12 14:22:02.000000000 -0600 -+++ makefile.in 2019-07-13 10:31:32.067349296 -0600 -@@ -28,7 +28,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) +--- makefile.in.orig 2019-10-09 05:37:19.000000000 -0600 ++++ makefile.in 2019-11-11 19:55:15.457515177 -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) #--------------------------------------------------------------------------# @@ -9,29 +17,30 @@ #--------------------------------------------------------------------------# -@@ -42,12 +42,18 @@ all: libcadical.a cadical mobical +@@ -42,11 +43,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. -cadical: cadical.o libcadical.a makefile +- $(COMPILE) -o $@ $< -L. -lcadical +cadical: cadical.o libcadical.so makefile - $(COMPILE) -o $@ $< -L. -lcadical ++ $(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical -mobical: mobical.o libcadical.a makefile +- $(COMPILE) -o $@ $< -L. -lcadical +mobical: mobical.o libcadical.so makefile - $(COMPILE) -o $@ $< -L. -lcadical - ++ $(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical ++ +libcadical.so: $(OBJ) makefile + rm -f $@ -+ $(COMPILE) -shared -Wl,-h,libcadical.so.0 -o libcadical.so.0.0.0 $(OBJ) ++ $(COMPILE) -shared -Wl,-h,libcadical.so.0 -o libcadical.so.0.0.0 $(LDFLAGS) $(OBJ) + ln -s libcadical.so.0.0.0 libcadical.so.0 + ln -s libcadical.so.0 $@ -+ + libcadical.a: $(OBJ) makefile ar rc $@ $(OBJ) - ---- test/api/run.sh.orig 2019-07-12 14:22:02.000000000 -0600 -+++ test/api/run.sh 2019-07-13 10:31:32.074349289 -0600 +--- test/api/run.sh.orig 2019-10-09 05:37:19.000000000 -0600 ++++ test/api/run.sh 2019-11-11 19:53:41.432729399 -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.rpmlintrc b/cadical.rpmlintrc new file mode 100644 index 0000000..71944f0 --- /dev/null +++ b/cadical.rpmlintrc @@ -0,0 +1,8 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# The documentation is in the doc package +addFilter(r'cadical-devel\.[^:]+: W: no-documentation') + +# The configure script is not an autotools-generated script +addFilter(r'cadical\.spec:[^:]*: W: configure-without-libdir-spec') diff --git a/cadical.spec b/cadical.spec index 58d21f4..9dbaa8c 100644 --- a/cadical.spec +++ b/cadical.spec @@ -1,7 +1,7 @@ Name: cadical Epoch: 1 -Version: 1.0.3 -Release: 3%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Simplified SAT solver License: MIT @@ -49,6 +49,7 @@ sed -i '/^-e/s/,/|/g;s/-O3/-O2/' configure # The configure script is NOT generated by autoconf. Do NOT use the # %%configure macro here. CXXFLAGS="%{optflags} -fPIC" ./configure %{?_smp_mflags} +sed -i "s|@LDFLAGS@|$RPM_LD_FLAGS|" build/makefile %make_build # Make man pages for the command line interface @@ -105,6 +106,9 @@ make -C test %{_libdir}/lib%{name}.so %changelog +* Mon Nov 11 2019 Jerry James - 1:1.2.1-1 +- Version 1.2.1 + * Wed Jul 24 2019 Jerry James - 1:1.0.3-3 - Bump Epoch to fix upgrades from version 06w diff --git a/sources b/sources index 558af4f..e7e57f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rel-1.0.3.tar.gz) = 96d90272f5e265456a10b2eb53c1c844996efb33a9ece9653ec4205eb054b429f7d9575eb76a137293208e789b0f840e770d9b140b97fc294a4127f292f66793 +SHA512 (rel-1.2.1.tar.gz) = 057632621a86f3ac9d522deb532bbb84bd1e8cadb4269e4caa921a99d51ce20f758c4560890644b20fb14e2bc14d8048df94d2fca05bf2611d7e6a1912fb1db7