rpms/frama-c/devel frama-c-1.4-fix-ocamlgraph-detection.patch, NONE, 1.1 frama-c-1.4-licensing, NONE, 1.1 frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch, NONE, 1.1 frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch, NONE, 1.1 frama-c.desktop, NONE, 1.1 frama-c.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mark Rader
mrader at fedoraproject.org
Thu Jul 22 02:19:48 UTC 2010
Author: mrader
Update of /cvs/pkgs/rpms/frama-c/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24250/devel
Modified Files:
.cvsignore sources
Added Files:
frama-c-1.4-fix-ocamlgraph-detection.patch
frama-c-1.4-licensing
frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch
frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch
frama-c.desktop frama-c.spec import.log
Log Message:
----------------------------------------------------------------------
Committing in by Mark Rader.
Added Files:
devel/frama-c-1.4-fix-ocamlgraph-detection.patch
devel/frama-c-1.4-licensing
devel/frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch
devel/frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch
devel/frama-c.desktop devel/frama-c.spec devel/import.log
----------------------------------------------------------------------
frama-c-1.4-fix-ocamlgraph-detection.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE frama-c-1.4-fix-ocamlgraph-detection.patch ---
--- frama-c-Beryllium-20090902/configure 2009-09-23 11:22:26.000000000 -0400
+++ frama-c-Beryllium-20090902-build/configure 2010-01-17 07:03:17.767405278 -0500
@@ -2647,7 +2647,7 @@
if test "$OCAMLGRAPH_EXISTS" == "yes"; then
test_ocamlgraph_version='print_string Graph.Version.version;;'
echo $test_ocamlgraph_version > test_ocamlgraph.ml
- if ocamlc -o test_ocamlgraph $OCAMLGRAPH graph.cmo test_ocamlgraph.ml 2> /dev/null; then
+ if ocamlc -o test_ocamlgraph $OCAMLGRAPH graph.cma test_ocamlgraph.ml 2> /dev/null; then
OCAMLGRAPH_VERSION=`./test_ocamlgraph`
case $OCAMLGRAPH_VERSION in
1.3) { $as_echo "$as_me:$LINENO: ocamlgraph $OCAMLGRAPH_VERSION found" >&5
--- NEW FILE frama-c-1.4-licensing ---
Breakdown of files by license:
Most files are LGPL v2.1, so only the non LGPL v2.1 files will be listed:
BSD:
cil/* except cil/src/logic/* which is LGPL v2.1
tests/minix/*
external/unmarshal*
GPL v2:
tests/spec/purse.c
GPL v2+:
tests/idtc/*
GPL (no version):
tests/bugs/evoting.c
QPL with modifications (see licenses/Q_MODIFIED_LICENSE):
external/ptmap.ml*
-------------------------------------------------------------------------
Determination made as follows:
grep -L -r -i LGPLv2.1 * | grep -E -v '^tests|^cil'
will find the non LGPLv2.1 items that are not in tests/ or cil/. These
directories were examined more carefully separately.
frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch:
ptests.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch ---
--- frama-c-Beryllium-20090902.old/ptests/ptests.ml 2010-02-10 21:12:10.117393041 -0500
+++ frama-c-Beryllium-20090902/ptests/ptests.ml 2010-02-10 21:12:16.789253456 -0500
@@ -54,7 +54,7 @@
fun a b -> let r = temp_file a b in
cygpath r
else
- temp_file
+ (fun x y -> temp_file x y)
end
let default_env var value =
frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch:
dynlink_lower_311_byte.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch ---
From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date: Tue, 1 Sep 2009 10:17:52 +0200
Subject: [PATCH] Fix weak pattern-matching in dynlink_lower_311_byte.ml
---
src/lib/dynlink_lower_311_byte.ml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/lib/dynlink_lower_311_byte.ml b/src/lib/dynlink_lower_311_byte.ml
index 58e0ee5..fc2705e 100644
--- a/src/lib/dynlink_lower_311_byte.ml
+++ b/src/lib/dynlink_lower_311_byte.ml
@@ -84,6 +84,7 @@ let from_dynlink_error = function
| Dynlink.Corrupted_interface s -> Corrupted_interface s
| Dynlink.File_not_found s -> File_not_found s
| Dynlink.Cannot_open_dll s -> Cannot_open_dll s
+ | Dynlink.Inconsistent_implementation s -> Inconsistent_implementation s
let stub_error f x =
try f x with Dynlink.Error e -> raise (Error (from_dynlink_error e))
--
--- NEW FILE frama-c.desktop ---
[Desktop Entry]
Name=Frama-C
GenericName=Frama C
Exec=frama-c-gui
Icon=gnome-gmush
Terminal=false
Type=Application
Categories=Development;
--- NEW FILE frama-c.spec ---
# Some ideas for this spec file taken from a prior attempt by Richard
# W. M. Jones
# General Information
# This program has its own version of cil, there is an ocaml-cil upon which this
# based, however the version contained in this package has custom mods that
# are not availible with the ocaml-cil because the upstream has
# forked their own version of cil.
%global debug_package %{nil}
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if %opt
%global ocamlbest opt
%else
%global ocamlbest byte
%endif
%global pkgversion Beryllium-20090902
Name: frama-c
Version: 1.4
Release: 5%{?dist}
Summary: Framework for source code analysis of C software
Group: Development/Libraries
# Licensing breakdown in source file frama-c-1.4-licensing
License: LGPLv2 and GPLv2 and GPLv2+ and BSD and (QPL with modifications)
URL: http://frama-c.cea.fr/
Source0: http://frama-c.cea.fr/download/%{name}-%{pkgversion}.tar.gz
Source1: frama-c-1.4-licensing
Source2: %{name}.desktop
#Patch to use new extensions in fedora 13. This patch changes the configuration to
#look for a different file extension in ocaml
Patch0: frama-c-1.4-fix-ocamlgraph-detection.patch
# There are four patches from Medhi Dogguy in the Debian package:
#
# 0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
#
# This seems to apply for us as well, keeping Debian filename
Patch1: frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch
#Patch to use new extensions in fedora 13. This patch changes the configuration to
#look for a different file extension in ocaml
Patch2: frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ocaml >= 3.11.0, ocaml-findlib-devel, ocaml-lablgtk-devel, ocaml-ocamlgraph-devel
BuildRequires: gtksourceview >= 1.0.0, gtksourceview-devel
BuildRequires: libgnomecanvas-devel
BuildRequires: desktop-file-utils
# specialized dependency generator used because of issues with OCAML at the
# suggestion of the OCAML group
%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i GtkSourceView_types -i Ltlast -i Promelaast
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i GtkSourceView_types -i Ltlast -i Promelaast
Requires: graphviz >= 2.0.0
Requires: gtksourceview >= 1.0.0
Requires: ocaml >= 3.11.0
ExcludeArch: PPC, PPC64, ARM, IA64, MIPS, S390
%description
Frama-C is a suite of tools dedicated to the analysis of the source
code of software written in C.
Frama-C gathers several static analysis techniques in a single
collaborative framework. The collaborative approach of Frama-C allows
static analyzers to build upon the results already computed by other
analyzers in the framework. Thanks to this approach, Frama-C provides
sophisticated tools, such as a slicer and dependency analysis.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}. In particular, this package
is necessary to compile plug ins for Frama-C.
%prep
%setup -q -n %{name}-%pkgversion
%patch0 -p1
%patch1 -p1
%if 0%{?fedora} >= 13
%patch2 -p1
%endif
iconv -f iso-8859-1 -t utf8 man/frama-c.1 > man/frama-c.1.conv && mv man/frama-c.1.conv man/frama-c.1
%build
# This option prints the actual make commands so we can see what's
# happening (eg: for debugging the spec file)
%global framac_make_options VERBOSEMAKE=yes OCAMLBEST=%{ocamlbest}
%configure
make %{framac_make_options}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} %{framac_make_options}
strip %{buildroot}/%{_bindir}/frama-c
strip %{buildroot}/%{_bindir}/frama-c-gui
strip %{buildroot}/%{_libdir}/frama-c/plugins/Ltl_to_acsl.cmxs
desktop-file-install \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE2}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/*
%doc licenses/LGPLv2.1
%doc licenses/LGPLv3
%doc licenses/Q_MODIFIED_LICENSE
%doc cil/LICENSE
%exclude %{_bindir}/frama-c.byte
%exclude %{_bindir}/frama-c-gui.byte
%exclude %{_bindir}/ptests.byte
%exclude %{_libdir}/frama-c/*.cmo
%exclude %{_libdir}/frama-c/*.cmx
%exclude %{_libdir}/frama-c/*.o
%{_libdir}/frama-c
%dir %{_datadir}/frama-c
%{_datadir}/frama-c/frama-c.rc
%{_datadir}/frama-c/why
%{_datadir}/frama-c/manuals
%{_datadir}/applications
%{_mandir}/man1/*
%exclude %{_datadir}/frama-c
%files devel
%defattr(-,root,root,-)
%{_datadir}/frama-c/*
%{_mandir}/man1/*
%exclude %{_datadir}/frama-c/why
%exclude %{_datadir}/frama-c/manuals
%exclude %{_mandir}/man1/frama-c.1.gz
%exclude %{_mandir}/man1/frama-c-gui.1.gz
%post
semanage fcontext -a -t textrel_shlib_t '%{_libdir}/frama-c/plugins/Ltl_to_acsl.cmxs'
restorecon -v '%{_libdir}/frama-c/plugins/Ltl_to_acsl.cmxs'
%changelog
* Sun Jul 18 2010 Mark Rader <msrader at gmail.com> 1.4-5
- Modified comments to patch 1 in spec file
- Corrected SELinux context settings
* Mon Jul 05 2010 Mark Rader <msrader at gmail.com> 1.4-4
- Modified spec file to add new OCAML dependency structure for FC-13
* Sun Jun 06 2010 Mark Rader <msrader at gmail.com> 1.4-3
- Added documentation to explain the various licensing entries.
- Added .desktop file
* Wed May 24 2010 Mark Rader <msrader at gmail.com> 1.4-2
- Add SELinux context settings.
* Wed Feb 10 2010 Alan Dunn <amdunn at gmail.com> 1.4-1
- Initial Fedora RPM
--- NEW FILE import.log ---
frama-c-1_4-5_fc12:HEAD:frama-c-1.4-5.fc12.src.rpm:1279765067
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/frama-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 21 Jul 2010 05:22:21 -0000 1.1
+++ .cvsignore 22 Jul 2010 02:19:48 -0000 1.2
@@ -0,0 +1 @@
+frama-c-Beryllium-20090902.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/frama-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 21 Jul 2010 05:22:21 -0000 1.1
+++ sources 22 Jul 2010 02:19:48 -0000 1.2
@@ -0,0 +1 @@
+a713f362cf62af434b23f79186e4d8e7 frama-c-Beryllium-20090902.tar.gz
More information about the scm-commits
mailing list