From 4c5e5949d12db36f1184cf2eda93300b7aba6755 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 13 2018 03:17:37 +0000 Subject: Update to Sulfur version. Drop upstreamed -safe-string patch. --- diff --git a/.gitignore b/.gitignore index 5262d51..a9eac63 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,14 @@ /user-manual-Phosphorus-20170501.pdf /value-analysis-Phosphorus-20170501.pdf /wp-manual-Phosphorus-20170501.pdf +/frama-c-Sulfur-20171101.tar.gz +/frama-c-Sulfur-20171101_api.tar.gz +/acsl-implementation-Sulfur-20171101.pdf +/aorai-manual-Sulfur-20171101.pdf +/e-acsl-manual_Sulfur-20171101.pdf +/metrics-manual-Sulfur-20171101.pdf +/plugin-development-guide-Sulfur-20171101.pdf +/rte-manual-Sulfur-20171101.pdf +/user-manual-Sulfur-20171101.pdf +/value-analysis-Sulfur-20171101.pdf +/wp-manual-Sulfur-20171101.pdf diff --git a/frama-c.spec b/frama-c.spec index c2caf22..a9083ab 100644 --- a/frama-c.spec +++ b/frama-c.spec @@ -2,16 +2,15 @@ # ocaml-cil package as a replacement, because Frama-C upstream has modified # their version in incompatible ways. -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%if ! %opt +%ifnarch %{ocaml_native_compiler} %global debug_package %{nil} %endif -%global pkgversion Phosphorus-20170501 +%global pkgversion Sulfur-20171101 Name: frama-c -Version: 15.0 -Release: 8%{?dist} +Version: 16.0 +Release: 1%{?dist} Summary: Framework for source code analysis of C software # Licensing breakdown in source file frama-c-1.6-licensing @@ -35,9 +34,6 @@ Source14: http://frama-c.com/download/e-acsl/e-acsl-manual_%{pkgversion}.p # Icons created with gimp from the official upstream icon Source15: %{name}-icons.tar.xz -# Patch to fix -safe-string in OCaml 4.06. -Patch1: frama-c-15-safe-string.patch - BuildRequires: alt-ergo BuildRequires: coq BuildRequires: desktop-file-utils @@ -116,16 +112,12 @@ files marked up with ACSL. %setup -q -n %{name}-%{pkgversion} %setup -q -T -D -a 1 -n %{name}-%{pkgversion} %setup -q -T -D -a 15 -n %{name}-%{pkgversion} -%patch1 -p1 # Copy in the manuals mkdir doc/manuals cp -p %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} \ %{SOURCE12} %{SOURCE13} %{SOURCE14} doc/manuals -# Do not use the bundled version of ocamlgraph -rm -f ocamlgraph.tar.gz - # Enable debuginfo sed -i 's/ -pack/ -g&/;s/^OPT.*=/& -g/' src/plugins/wp/qed/src/Makefile @@ -140,9 +132,6 @@ sed -ri 's/^CP[[:blank:]]+=.*/& -p/' share/Makefile.common # Build buckx with the right flags sed -i "s|-O3 -Wall|%{optflags} -fPIC|" Makefile -# Fix detection of why3 -sed -i '/why3/s/\*\\) \.\*/*\\).*/' configure src/plugins/wp/configure - %build # This option prints the actual make commands so we can see what's # happening (eg: for debugging the spec file) @@ -152,7 +141,7 @@ make %install make install DESTDIR=%{buildroot} -%if %opt +%ifarch %{ocaml_native_compiler} mv -f %{buildroot}%{_bindir}/ptests.opt %{buildroot}%{_bindir}/ptests %else mv -f %{buildroot}%{_bindir}/frama-c.byte %{buildroot}%{_bindir}/frama-c @@ -210,17 +199,20 @@ find %{buildroot}%{_datadir}/frama-c -type f -perm /0111 -exec chmod a-x {} + # Remove spurious executable bits on generated files chmod 0644 src/libraries/stdlib/integer.ml src/plugins/value/domains/apron/*.ml +# Add a missing executable bit +chmod 0755 %{buildroot}%{_bindir}/*.sh + %files %doc VERSION %license licenses/* %{_bindir}/* -%if %opt +%ifarch %{ocaml_native_compiler} %exclude %{_bindir}/frama-c.byte %exclude %{_bindir}/frama-c-gui.byte %endif %{_libdir}/frama-c/ +%{_libdir}/libeacsl-dlmalloc.a %{_libdir}/libeacsl-gmp.a -%{_libdir}/libeacsl-jemalloc.a %{_datadir}/frama-c/ %{_datadir}/appdata/%{name}-gui.appdata.xml %{_datadir}/applications/%{name}-gui.desktop @@ -250,6 +242,10 @@ chmod 0644 src/libraries/stdlib/integer.ml src/plugins/value/domains/apron/*.ml %{_xemacs_sitestartdir}/acsl.el %changelog +* Mon Feb 12 2018 Jerry James - 16.0-1 +- Update to Sulfur version +- Drop upstreamed -safe-string patch + * Wed Feb 07 2018 Fedora Release Engineering - 15.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 0b6c51f..292cd20 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -SHA512 (frama-c-Phosphorus-20170501.tar.gz) = b3b73932378cba7be8ac0cbb1f7311e8f60dde68cad55c10659ffa40e76ab3f106d554e245ccd90ffb5307b9a42b6ce51154a5b9c006687b8c5808c77ca4c2f3 -SHA512 (frama-c-Phosphorus-20170501_api.tar.gz) = 5d5a564cd13d61357cd3afbb69f9fd07c52ed2cb696fa50dafe4eabbbb270ee18b66b711948b6c6d064bdf1076bf1ee4a663c03389b5f5dab2d8d8a349eaf570 +SHA512 (frama-c-Sulfur-20171101.tar.gz) = 8ae9ba16aa9018cb343f820969a1edebea73e8ac4a07180a27ebd6d1fa8746cca5dad697deefbcc553c6d7e530319595366a66c63265ad66b9cddc4546fae14d +SHA512 (frama-c-Sulfur-20171101_api.tar.gz) = 50e39095d81c5cc4a52deeae87823ab6efccf4c9754676bbeca016d40683f8afb2abbc3046a67f790f110223cf30b539c15915fb0b888811e57182ef5310fd9a SHA512 (frama-c-icons.tar.xz) = 9fb1f6fc32559cfb74491c7f284c4c111d1ce0720fecca8a84713cb68bfa1c77cbeb241c720f58ef0a1140076d2d324f1dcae6cb47650e73c7915e82b2a6914d -SHA512 (acsl-implementation-Phosphorus-20170501.pdf) = d69b646bd09cb86540f2b50478b9a8d5463d5b1059b173b9bc0fb5b2b0e59b7c7961bccd0aef41b70273ad3a63f37ae3d942c704d177a59e918e6922aeb57572 -SHA512 (aorai-manual-Phosphorus-20170501.pdf) = 1238f882d564d78c6cb7157c4630b0189e3ac6cf5f9642bf08b20ccad3dbff7bf3178d2d60e27b681daac95d576f5465b1acb843dd87063b7593e28bc5d584f2 -SHA512 (e-acsl-manual_Phosphorus-20170501.pdf) = 5e074808f2162fda670dcd640532c32df49515adb186f97927064109233333a37534d37692aca4b60fe9c7066140fe9d43c40765787f2be8b5d64190e2336a31 -SHA512 (metrics-manual-Phosphorus-20170501.pdf) = 6a92b71c6e04147db9402e411232c5a2f13ae5b22d20532e439702f572b3c80db50f4651b81b2ea4ebac6a6147caf090213f27125d4ab47f58041e7ca5b7ab84 -SHA512 (plugin-development-guide-Phosphorus-20170501.pdf) = 49a87ef502d4a6a2822c26348dd277cc73aa914c63f84e4a4344cf51fb4f99f7b18e467b8d62077b1b9537dbcd33144a605c0e63fc27fc480f69937cae223ae3 -SHA512 (rte-manual-Phosphorus-20170501.pdf) = d1df3ecb2221020a57faec21dc02860d81a9a998e4f8c727960e885cf42feb735be7fc308206ea1e88dc5212502bb70dc1b5347abb046a3fff47d7564cd82ca6 -SHA512 (user-manual-Phosphorus-20170501.pdf) = c7747fadff9c26adb51b6dc5591aeb8c25a9b2e8da19f37bbdd25b4e01aeca38a856df1e8446455a276404e7302d6b421ba2cbe046a4d4bbe41bba5846938e97 -SHA512 (value-analysis-Phosphorus-20170501.pdf) = 784f353457b654425c08f69f19b6f715b88f40136c4b2b4499a5106ff15542cc41fca188b1255f7e4a4a17bb36aba96a2f1d0fe566ee8391c2012b7ede3ea375 -SHA512 (wp-manual-Phosphorus-20170501.pdf) = bf64f72203e988ce399dec5e6c0a5a7ca9278a9c85fae22b4dd31601bd40720934ce09288cf1a0d3e4085e5c843a33577f56a4d1436e5319bb0c7b1a14150282 +SHA512 (acsl-implementation-Sulfur-20171101.pdf) = cd4df751123285d7f482fda967ce38f7b52cace84161ee1b1d875eccb10d913b92cca4a3cf0d3ef4ceaecc99c366c425c4c4895dd8286752e5e3048343e43ef4 +SHA512 (aorai-manual-Sulfur-20171101.pdf) = 200f240f27b38f9661c67b4e3ad2de56320d120fd42509b954b9033c8d423b030fbf2e3fef940aab233bb382862c6936727ce6b4182d8a06d1d3f03c4069c7d0 +SHA512 (e-acsl-manual_Sulfur-20171101.pdf) = d24712932fa79b311fafd649a68675282c3796146e349e3fc9e313af989d3c356254018cef6f2dd1df2db5fa7a62ac3fe4fbe76d513a585a6bb745e163ccc1c4 +SHA512 (metrics-manual-Sulfur-20171101.pdf) = f31d67924c3df15681268f521ab22bf08b924dd18936ea1dabe4fd2da51ef8a2067bc7be7e8d8f1734a2e7292418f7381c001b36bf47756baf93ceed2e7d0591 +SHA512 (plugin-development-guide-Sulfur-20171101.pdf) = 52674c088f2290bbbf70683e2f2c41a5ff2c8a4358371cff8d9c7a38865b1cadf442df8b639a17811119e1c73018c306ee8ef5ebd61c671e9ea9ace44b5a9bfb +SHA512 (rte-manual-Sulfur-20171101.pdf) = 61b244d93eb341c45201e6f9504deaf2adc18277757414e53332a610d873a419f534db01595626c5f4c7b6f725d037a45e25b0bd7a47b4541c1a37867f2eb1a8 +SHA512 (user-manual-Sulfur-20171101.pdf) = 2a514d260e83a3bc6891b2100747980f3682f61b3ef9752647a072ca03e495a85bd669d6191ebcac52fb895d12feca9ee9048abb4255e8e96054bdb06a672cc9 +SHA512 (value-analysis-Sulfur-20171101.pdf) = 9e830bca7bd88431c51f4af27aeed9a64a88a736aaccbc653d50931846e69f410855f417bdc432b6b3ec0e1978b95ed4d4d36907db0704ad4212f359d407be20 +SHA512 (wp-manual-Sulfur-20171101.pdf) = 11defab4ffad498022c79c0a3971e76ec2e6b5a4a85659ef9470a299f2fe58669b669d60c65db372f91a398bf7dc56836a3175004392ac4000cda5c70f89b477