[why] Fix broken conditionals.
Jerry James
jjames at fedoraproject.org
Thu Jul 14 17:36:22 UTC 2011
commit d34c2985773d59d9a19ac26c14fd419164d33768
Author: Jerry James <loganjerry at gmail.com>
Date: Thu Jul 14 11:35:56 2011 -0600
Fix broken conditionals.
why.spec | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/why.spec b/why.spec
index c206caf..1c62b01 100644
--- a/why.spec
+++ b/why.spec
@@ -20,7 +20,7 @@
Name: why
Version: 2.29
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Software verification platform
Group: Applications/Engineering
@@ -290,19 +290,15 @@ strip bin/rv_merge.opt bin/simplify2why.opt bin/tool-stat.opt \
%endif
%install
-%if %{has_pvs}
make install DESTDIR=%{buildroot} %{opt_option} PVSLIB=%{_libdir}/pvs/lib
-%else
-make install DESTDIR=%{buildroot} %{opt_option}
-%endif
# Fix a small bug in their Makefile: if no Coq, NO .v files should be installed
-%if %{!has_coq}
+%if ! %{has_coq}
rm -f `find %{buildroot}%{_datadir}/coq -name '*.v'`
%endif
# If no PVS, no .pvs files should be installed
-%if %{!has_pvs}
+%if ! %{has_pvs}
rm -fr %{buildroot}%{_libdir}/pvs
%endif
@@ -317,9 +313,14 @@ sed -e 's|ICON-LOCATION-BASE|%{why_data_dir}|' -i jessie.desktop
desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications jessie.desktop
+%if %{has_pvs}
+# Get rid of a BUILDROOT reference in a log file (fails QA_CHECK_RPATHS)
+sed -i "s|%{buildroot}||" %{buildroot}%{_libdir}/pvs/lib/why/top.out
+
mkdir -p %{buildroot}%{_libdir}/pvs/lib/ints/
cp -p div.pvs rem.pvs %{buildroot}%{_libdir}/pvs/lib/ints/
cp -p patch_jessie_pvs %{buildroot}%{_bindir}/
+%endif
%global why_doc_dir %{_defaultdocdir}/%{name}-%{version}
%global why_examples_dir %{why_doc_dir}/examples/
@@ -347,9 +348,6 @@ for f in `find -regex '.*\.c'`; do
cp -p $f %{buildroot}%{why_examples_dir}c/$f
done
-# Get rid of a BUILDROOT reference in a log file (fails QA_CHECK_RPATHS)
-sed -i "s|%{buildroot}||" %{buildroot}%{_libdir}/pvs/lib/why/top.out
-
# Remove a stray coq file (already installed in the right place)
rm -f %{buildroot}%{_libdir}/coq/jessie_why.v
@@ -435,6 +433,9 @@ diff -u min.why min_why.why.result # Show differences from correct result.
%changelog
+* Thu Jul 14 2011 Jerry James <loganjerry at gmail.com> - 2.29-2
+- Fix broken conditionals
+
* Mon Jul 11 2011 Jerry James <loganjerry at gmail.com> - 2.29-1
- New upstream release (fixes FTBFS: bz 715902)
- Remove unnecessary spec file elements (BuildRoot, etc.)
More information about the scm-commits
mailing list