From 5c6fb119b8c16494b144cb594fffbb64ceccb1ce Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jan 31 2011 18:44:00 +0000 Subject: * Mon Jan 31 2011 Jerry James - 1.2-4 - Fix Source0 URL - Don't use the OCaml dependency generators, which find no dependencies - Update list of supported arches from the ocaml spec file --- diff --git a/csisat.spec b/csisat.spec index 8915e98..eacfeb1 100644 --- a/csisat.spec +++ b/csisat.spec @@ -1,12 +1,12 @@ Name: csisat Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for LA+EUF Interpolation Group: Applications/Engineering License: ASL 2.0 URL: http://csisat.googlecode.com/ -Source0: http://csisat.googlecode.com/files/%{name}-%{version}.zip +Source0: http://code.google.com/p/csisat/downloads/detail?name=csisat-%{version}.zip # This patch has not been sent upstream. Upstream wishes to distribute the # picosat sources with their code. This patch builds with the system picosat # instead, and also adds missing dependencies so that parallel make works. @@ -14,13 +14,8 @@ Patch0: csisat-makefile.patch BuildRequires: glpk-devel, ocaml, picosat-devel, subversion -# Exclude arches where ocaml is not available -ExcludeArch: sparc64 s390 s390x - -# Use the Ocaml dependency generators -%global _use_internal_dependency_generator 0 -%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh -%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh +# This list should match the one in the ocaml spec file +ExclusiveArch: alpha armv4l %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64 %description CSIsat reads a set of mathematical formulas that may combine variables, @@ -65,6 +60,11 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/csisatServer %changelog +* Mon Jan 31 2011 Jerry James - 1.2-4 +- Fix Source0 URL +- Don't use the OCaml dependency generators, which find no dependencies +- Update list of supported arches from the ocaml spec file + * Thu Jan 27 2011 Jerry James - 1.2-3 - Rebuild for new picosat and new ocaml - BR subversion to eliminate build noise from svnversion failing