[picosat] New upstream release.
Jerry James
jjames at fedoraproject.org
Fri Nov 7 17:57:13 UTC 2014
commit 0f7c62cbe3219e571ad26447837d458a8946888e
Author: Jerry James <jamesjer at betterlinux.com>
Date: Fri Nov 7 10:56:53 2014 -0700
New upstream release.
Also:
- Drop upstreamed -alias patch.
- Fix license handling.
.gitignore | 2 +-
picosat-alias.patch | 39 ---------------------------------------
picosat-proof-access.patch | 10 +++++-----
picosat-trace.patch | 42 +++++++++++++++++++++---------------------
picosat.spec | 24 ++++++++++++++----------
sources | 2 +-
6 files changed, 42 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3757868..d3c8dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/picosat-957.tar.gz
+/picosat-960.tar.gz
diff --git a/picosat-proof-access.patch b/picosat-proof-access.patch
index ec04dc0..5a84e34 100644
--- a/picosat-proof-access.patch
+++ b/picosat-proof-access.patch
@@ -1,6 +1,6 @@
---- ./picosat.c.orig 2013-07-31 14:26:09.000000000 -0600
-+++ ./picosat.c 2013-07-31 14:41:10.000000000 -0600
-@@ -6383,6 +6383,168 @@ trace_zhain (PS * ps, unsigned idx, Zhn
+--- ./picosat.c.orig 2014-11-07 10:35:07.932128232 -0700
++++ ./picosat.c 2014-11-06 21:00:00.000000000 -0700
+@@ -6217,6 +6217,168 @@ trace_zhain (PS * ps, unsigned idx, Zhn
fputs (" 0\n", file);
}
@@ -169,8 +169,8 @@
static void
write_core (PS * ps, FILE * file)
{
---- ./picosat.h.orig 2013-06-01 07:35:00.000000000 -0600
-+++ ./picosat.h 2013-07-31 14:44:24.000000000 -0600
+--- ./picosat.h.orig 2014-10-26 04:03:30.000000000 -0600
++++ ./picosat.h 2014-11-06 21:00:00.000000000 -0700
@@ -275,6 +275,13 @@ void picosat_simplify (PicoSAT *);
*/
void picosat_adjust (PicoSAT *, int max_idx);
diff --git a/picosat-trace.patch b/picosat-trace.patch
index 80de5d7..9a598b2 100644
--- a/picosat-trace.patch
+++ b/picosat-trace.patch
@@ -1,5 +1,5 @@
---- ./makefile.in.orig 2013-06-01 07:35:00.000000000 -0600
-+++ ./makefile.in 2013-07-31 14:26:09.000000000 -0600
+--- ./makefile.in.orig 2014-10-26 04:03:30.000000000 -0600
++++ ./makefile.in 2014-11-06 21:00:00.000000000 -0700
@@ -12,16 +12,16 @@ clean:
analyze:
clang --analyze $(CFLAGS) *.c *.h
@@ -42,9 +42,23 @@
+ $(CC) $(CFLAGS) -fPIC -shared -o $@ picosat.o version.o $(SONAME)
.PHONY: all clean
---- ./picosat.c.orig 2013-06-01 07:35:00.000000000 -0600
-+++ ./picosat.c 2013-07-31 14:26:09.000000000 -0600
-@@ -6673,7 +6673,7 @@ check_trace_support_and_execute (PS * ps
+--- ./picomus.c.orig 2014-11-07 10:35:07.932128232 -0700
++++ ./picomus.c 2014-11-06 21:00:00.000000000 -0700
+@@ -193,9 +193,8 @@ static const char * USAGE =
+ "\n"
+ "This typically slows down this MUS extractor, since\n"
+ "it only relies on clause selector variables and\n"
+-"can not make use of core extraction. To enable\n"
+-"trace generation use './configure --trace' or\n"
+-"'./configure -O --trace' when building PicoSAT.\n"
++"can not make use of core extraction. To use trace\n"
++"support, run picomus.trace instead.\n"
+ #else
+ "Since trace generation code is included, this binary\n"
+ "uses also core extraction in addition to clause selector\n"
+--- ./picosat.c.orig 2014-10-26 04:03:30.000000000 -0600
++++ ./picosat.c 2014-11-06 21:00:00.000000000 -0700
+@@ -6507,7 +6507,7 @@ check_trace_support_and_execute (PS * ps
(void) file;
(void) fmt;
(void) f;
@@ -53,7 +67,7 @@
#endif
}
-@@ -7360,7 +7360,7 @@ picosat_corelit (PS * ps, int int_lit)
+@@ -7220,7 +7220,7 @@ picosat_corelit (PS * ps, int int_lit)
return res;
}
#else
@@ -62,7 +76,7 @@
return 0;
#endif
}
-@@ -7396,7 +7396,7 @@ picosat_coreclause (PS * ps, int ocls)
+@@ -7256,7 +7256,7 @@ picosat_coreclause (PS * ps, int ocls)
return res;
}
#else
@@ -71,17 +85,3 @@
return 0;
#endif
}
---- ./picomus.c.orig 2013-06-01 07:35:00.000000000 -0600
-+++ ./picomus.c 2013-07-31 14:26:09.000000000 -0600
-@@ -195,9 +195,8 @@ int main (int argc, char ** argv) {
- "\n"
- "This typically slows down this MUS extractor, since\n"
- "it only relies on clause selector variables and\n"
-- "can not make use of core extraction. To enable\n"
-- "trace generation use './configure --trace' or\n"
-- "'./configure -O --trace' when building PicoSAT.\n"
-+ "can not make use of core extraction. To use trace\n"
-+ "support, run picomus.trace instead.\n"
- #else
- "Since trace generation code is included, this binary\n"
- "uses also core extraction in addition to clause selector\n"
diff --git a/picosat.spec b/picosat.spec
index 51bdd3f..6f70c70 100644
--- a/picosat.spec
+++ b/picosat.spec
@@ -1,6 +1,6 @@
Name: picosat
-Version: 957
-Release: 3%{?dist}
+Version: 960
+Release: 1%{?dist}
Summary: A SAT solver
Group: Applications/Engineering
@@ -20,11 +20,10 @@ Patch0: %{name}-trace.patch
# extracting proofs in memory (i.e., not via a file), but csisat has not yet
# been adapted to that API.
Patch1: %{name}-proof-access.patch
-# Fix some violations of the C99 aliasing rules.
-Patch2: %{name}-alias.patch
-# gzip required (see app.c); find-requires can't see into C code to find it
-Requires: gzip, %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: bzip2
+Requires: gzip
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
PicoSAT solves the SAT problem, which is the classical NP complete
@@ -54,7 +53,6 @@ Headers and other development files for PicoSAT.
%setup -q
%patch0
%patch1
-%patch2
%build
# The configure script is NOT autoconf-generated and chooses its own CFLAGS,
@@ -62,7 +60,7 @@ Headers and other development files for PicoSAT.
# Build the version with trace support
sed -e "s/@CC@/gcc/" \
- -e "s/@CFLAGS@/${RPM_OPT_FLAGS} -DTRACE -DNDEBUG/" \
+ -e "s/@CFLAGS@/${RPM_OPT_FLAGS} -D_GNU_SOURCE=1 -DNDEBUG -DTRACE/" \
-e "s/-Xlinker libpicosat.so/-Xlinker libpicosat.so.0/" \
-e "s/libpicosat/libpicosat-trace/g" \
-e "s/-lpicosat/-lpicosat-trace/g" \
@@ -75,7 +73,7 @@ mv picosat picosat.trace
# Note that picomus needs trace support, so we don't rebuild it.
rm -f *.o *.s config.h
sed -e "s/@CC@/gcc/" \
- -e "s/@CFLAGS@/${RPM_OPT_FLAGS} -DNDEBUG/" \
+ -e "s/@CFLAGS@/${RPM_OPT_FLAGS} -D_GNU_SOURCE=1 -DNDEBUG/" \
-e "s/-Xlinker libpicosat.so/-Xlinker libpicosat.so.0/" \
-e "s/@TARGETS@/libpicosat.so picosat picomcs picogcnf/" \
makefile.in > makefile
@@ -113,7 +111,8 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1
%{_mandir}/man1/picomus*
%files libs
-%doc LICENSE NEWS
+%doc NEWS
+%license LICENSE
%{_libdir}/libpicosat-trace.so.*
%{_libdir}/libpicosat.so.*
@@ -123,6 +122,11 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1
%{_libdir}/libpicosat.so
%changelog
+* Fri Nov 7 2014 Jerry James <loganjerry at gmail.com> - 960-1
+- New upstream release
+- Drop upstreamed -alias patch
+- Fix license handling
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 957-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index f06e750..fc71368 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6cb7d32a61b19e450961c689841aaccb picosat-957.tar.gz
+bee515cd9fd12ffaffab10b3587aa833 picosat-960.tar.gz
More information about the scm-commits
mailing list