[frama-c] modified: .gitignore deleted: frama-c-1.4-fix-ocamlgraph-detection.patch deleted: frama-c

Mark Rader mrader at fedoraproject.org
Tue Jan 18 22:14:01 UTC 2011 

commit 6c8d0070b38a00b4f23d52a30b1dee3a9c6aa1d7
Author: Mark Rader <msrader at gmail.com>
Date:   Tue Jan 18 16:12:48 2011 -0600

    	modified:   .gitignore
    	deleted:    frama-c-1.4-fix-ocamlgraph-detection.patch
    	deleted:    frama-c-1.4-licensing
    	deleted:    frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch
    	deleted:    frama-c-Fix-weak-pattern-matching-in-dynlink_lower_311_byte.patch
    	deleted:    frama-c.desktop
    	modified:   frama-c.spec
    	modified:   sources
            updated Frama-C-Boron

 .gitignore                                         |    3 +
 frama-c-1.4-fix-ocamlgraph-detection.patch         |   11 ---
 frama-c-1.4-licensing                              |   26 -------
 frama-c-1.4-ptests-fix-for-ocaml-3.11.2.patch      |   11 ---
 ...attern-matching-in-dynlink_lower_311_byte.patch |   21 ------
 frama-c.desktop                                    |    9 ---
 frama-c.spec                                       |   74 +++++++-------------
 sources                                            |    2 -
 8 files changed, 29 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2092118..a0c65e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ frama-c-Beryllium-20090902.tar.gz
 frama-c-Boron-20100401.tar.gz
 frama-c-1.5.licensing
 frama-c-gui.desktop
+/frama-c-Boron-20100401.tar.gz
+/frama-c-gui.desktop
+/frama-c-1.5.licensing
diff --git a/frama-c.spec b/frama-c.spec
index 6f59196..f0dc14c 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -16,11 +16,11 @@
 %global ocamlbest byte
 %endif
 
-%global pkgversion Beryllium-20090902
+%global pkgversion Boron-20100401
 
 Name:           frama-c
-Version:        1.4
-Release:        6%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Framework for source code analysis of C software
 
 Group:          Development/Libraries
@@ -28,40 +28,25 @@ Group:          Development/Libraries
 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
+Source1:        frama-c-1.5.licensing
+Source2:        %{name}-gui.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: ocaml >= 3.11.0, ocaml-findlib-devel, ocaml-lablgtk-devel >= 2.14.0-5 , ocaml-ocamlgraph-devel
+BuildRequires: gtksourceview >= 1.0.0, gtksourceview-devel, gtksourceview2, gtksourceview2-devel
 BuildRequires: libgnomecanvas-devel
 BuildRequires: desktop-file-utils
+BuildRequires: ltl2ba >= 1.1
 
 # 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
+%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh  -i GtkSourceView2_types -i Ltlast -i Promelaast -i Cil_types -i Db_types -i Dgraph -i Lattice_With_Isotropy -i Logic_ptree -i Signature
+%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh -i GtkSourceView2_types -i Ltlast -i Promelaast -i Cil_types -i Db_types -i Dgraph -i Lattice_With_Isotropy -i Logic_ptree -i Signature
 
 
 Requires: graphviz >= 2.0.0
@@ -95,12 +80,6 @@ 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
 
@@ -110,7 +89,8 @@ iconv -f iso-8859-1 -t utf8 man/frama-c.1 > man/frama-c.1.conv && mv man/frama-c
 # happening (eg: for debugging the spec file)
 %global framac_make_options VERBOSEMAKE=yes OCAMLBEST=%{ocamlbest}
 
-%configure
+# Must disable plug-ins that no longer work, else running will cause warnings.
+%configure --disable-security_slicing --disable-aorai
 make %{framac_make_options}
 
 
@@ -120,10 +100,12 @@ 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
-
+chmod -x  %{buildroot}/usr/share/frama-c/libc/*.h
+chmod -x  %{buildroot}/usr/share/frama-c/libc/*.c
+chmod -x  %{buildroot}/usr/share/frama-c/libc/sys/*.h
+chmod -x  %{buildroot}/usr/share/frama-c/libc/netinet/*.h
 desktop-file-install                                    \
---dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
+--dir=${RPM_BUILD_ROOT}%{_datadir}/applications/         \
 %{SOURCE2}
 
 %clean
@@ -144,17 +126,18 @@ rm -rf %{buildroot}
 %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
+%dir %{_datadir}/frama-c/
+%{_datadir}/frama-c/*
+%{_datadir}/applications/*.desktop
 %{_mandir}/man1/*
 %exclude %{_datadir}/frama-c
 
 %files devel
 %defattr(-,root,root,-)
 %{_datadir}/frama-c/*
+%{_libdir}/frama-c/*.cmo
+%{_libdir}/frama-c/*.cmx
+%{_libdir}/frama-c/*.o
 %{_mandir}/man1/*
 %exclude %{_datadir}/frama-c/why
 %exclude %{_datadir}/frama-c/manuals
@@ -162,16 +145,11 @@ rm -rf %{buildroot}
 %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
-* Fri Jan 07 2011 Richard W.M. Jones <rjones at redhat.com> - 1.4-6
-- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
 
-* 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
+%changelog
+* Sat Jul 07 2010 Mark Rader <msrader at gmail.com> 1.5-1
+- Upgraded Frama C to Boron version and added ltl2ba dependencies.
 
 * 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
diff --git a/sources b/sources
index c4a4f87..9a16e5d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-4350b26e277f7be176423be2b3420506  frama-c-Boron-20100401.tar.gz
 4775a1c3281826717ca9b4de5ce3fefe  frama-c-1.5.licensing
-0931774c54488efc3ed9860879aa7ac7  frama-c-gui.desktop

More information about the scm-commits mailing list