From d7db038b2a6ceea1218d832082493b502652360d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Oct 27 2009 21:43:21 +0000 Subject: - Drop the graphviz BR to block generation of huge class graphs - Use the new (X)Emacs RPM macros to simplify the spec file --- diff --git a/cvc3.spec b/cvc3.spec index 5c960c7..1c1ef56 100644 --- a/cvc3.spec +++ b/cvc3.spec @@ -1,27 +1,14 @@ -# If the emacs-el package has installed a pkgconfig file, use that to determine -# install locations and Emacs version at build time, otherwise set defaults. -%if %($(pkg-config emacs) ; echo $?) -%define emacs_version 22.1 -%define emacs_lispdir %{_datadir}/emacs/site-lisp -%else -%define emacs_version %(pkg-config emacs --modversion) -%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) -%endif - # If the xemacs-devel package has installed a pkgconfig file, use that to -# determine install locations and Emacs version at build time, otherwise set -# defaults. +# determine version at build time, otherwise set a default. %if %($(pkg-config xemacs) ; echo $?) %define xemacs_version 21.5 -%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp %else %define xemacs_version %(pkg-config xemacs --modversion) -%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir) %endif Name: cvc3 Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Validity checker of many-sorted first-order formulas with theories Group: Applications/Engineering @@ -42,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch3: cvc3-java.patch BuildRequires: bison, doxygen, emacs, emacs-el, flex, gnu-free-sans-fonts -BuildRequires: gmp-devel, graphviz, java-devel, jpackage-utils, perl, time +BuildRequires: gmp-devel, java-devel, jpackage-utils, perl, time BuildRequires: transfig, tex(latex), xemacs, xemacs-devel Requires: gnu-free-sans-fonts @@ -82,6 +69,7 @@ is not true (e.g., i = 0 and j = -1). Group: Development/Libraries Summary: Header files for development with CVC3 Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description devel Header files need to develop with CVC3. @@ -90,6 +78,7 @@ Header files need to develop with CVC3. Group: Documentation Summary: API documentation for CVC3 Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc API documentation for CVC3. @@ -105,8 +94,9 @@ Java interface for CVC3. %package emacs Group: Applications/Engineering Summary: Compiled Emacs mode for CVC3 -Requires: emacs(bin) >= %{emacs_version} +Requires: emacs(bin) >= %{_emacs_version} Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description emacs This package contains the byte compiled CVC3 mode for Emacs. @@ -115,6 +105,7 @@ This package contains the byte compiled CVC3 mode for Emacs. Group: Applications/Engineering Summary: Elisp source files for the CVC3 Emacs mode Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description emacs-el This package contains the source Elisp files for the CVC3 mode for Emacs. You @@ -126,6 +117,7 @@ Group: Applications/Engineering Summary: Compiled XEmacs mode for CVC3 Requires: xemacs(bin) >= %{xemacs_version} Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description xemacs This package contains the byte compiled CVC3 mode for XEmacs. @@ -134,6 +126,7 @@ This package contains the byte compiled CVC3 mode for XEmacs. Group: Applications/Engineering Summary: Elisp source files for the CVC3 XEmacs mode Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description xemacs-el This package contains the source Elisp files for the CVC3 mode for XEmacs. You @@ -169,17 +162,17 @@ mkdir -p %{buildroot}%{_libdir}/%{name} %makeinstall javadir=%{buildroot}%{_libdir}/%{name} # Byte compile the CVC3 mode file for Emacs -mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp -cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/emacs/site-lisp -pushd %{buildroot}%{_datadir}/emacs/site-lisp -emacs --batch --no-site-file -f batch-byte-compile cvc-mode.el +mkdir -p %{buildroot}%{_emacs_sitelispdir} +cp -p emacs/cvc-mode.el %{buildroot}%{_emacs_sitelispdir} +pushd %{buildroot}%{_emacs_sitelispdir} +%{_emacs_bytecompile} cvc-mode.el popd # Byte compile the CVC3 mode file for XEmacs -mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp -cp -p emacs/cvc-mode.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp -pushd %{buildroot}%{_datadir}/xemacs/site-packages/lisp -xemacs --batch --no-site-file -f batch-byte-compile cvc-mode.el +mkdir -p %{buildroot}%{_xemacs_sitelispdir} +cp -p emacs/cvc-mode.el %{buildroot}%{_xemacs_sitelispdir} +pushd %{buildroot}%{_xemacs_sitelispdir} +%{_xemacs_bytecompile} cvc-mode.el popd # Add missing executable bits to the shared libraries @@ -188,12 +181,6 @@ chmod a+x %{buildroot}%{_libdir}/*.so.* # Move the JNI libraries to the right place mv %{buildroot}%{_libdir}/libcvc3jni.* %{buildroot}%{_libdir}/%{name} -# FIXME: dot segfaults on building one inheritance graph, leaving a 0-byte file -badfile="doc/html/classHash_1_1hash__table__inherit__graph.png" -if [ -f "$badfile" -a ! -s "$badfile" ] ; then - rm -f "$badfile" -fi - %check LD_LIBRARY_PATH=`pwd`/lib make regressonly4 @@ -225,21 +212,25 @@ rm -rf %{buildroot} %files emacs %defattr(-,root,root,-) -%{_datadir}/emacs/site-lisp/*.elc +%{_emacs_sitelispdir}/*.elc %files emacs-el %defattr(-,root,root,-) -%{_datadir}/emacs/site-lisp/*.el +%{_emacs_sitelispdir}/*.el %files xemacs %defattr(-,root,root,-) -%{_datadir}/xemacs/site-packages/lisp/*.elc +%{_xemacs_sitelispdir}/*.elc %files xemacs-el %defattr(-,root,root,-) -%{_datadir}/xemacs/site-packages/lisp/*.el +%{_xemacs_sitelispdir}/*.el %changelog +* Tue Oct 27 2009 Jerry James - 2.1-3 +- Drop the graphviz BR to block generation of huge class graphs +- Use the new (X)Emacs RPM macros to simplify the spec file + * Mon Oct 19 2009 Jerry James - 2.1-2 - Fix problems found on review - Enable the Java interface