diff --git a/.gitignore b/.gitignore index c330998..1ebfbfe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /user-manual-Neon-20140301.pdf /value-analysis-Neon-20140301.pdf /wp-manual-Neon-20140301.pdf +/frama-c-icons.tar.xz diff --git a/frama-c-gui.desktop b/frama-c-gui.desktop index 01ba116..9e403d9 100644 --- a/frama-c-gui.desktop +++ b/frama-c-gui.desktop @@ -2,7 +2,7 @@ Name=Frama-C GenericName=Frama C Exec=frama-c-gui -Icon=gnome-gmush +Icon=frama-c Terminal=false Type=Application Categories=Development; diff --git a/frama-c.spec b/frama-c.spec index 3aaac3b..bcd787b 100644 --- a/frama-c.spec +++ b/frama-c.spec @@ -16,7 +16,7 @@ Name: frama-c Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Framework for source code analysis of C software Group: Development/Libraries @@ -37,12 +37,13 @@ Source10: http://frama-c.com/download/metrics-manual-%{pkgversion}.pdf Source11: http://frama-c.com/download/rte-manual-%{pkgversion}.pdf Source12: http://frama-c.com/download/value-analysis-%{pkgversion}.pdf Source13: http://frama-c.com/download/wp-manual-%{pkgversion}.pdf +# Icons created with gimp from the official upstream icon +Source14: %{name}-icons.tar.xz BuildRequires: alt-ergo BuildRequires: coq BuildRequires: desktop-file-utils BuildRequires: emacs-nox xemacs-nox -BuildRequires: gmp-devel BuildRequires: graphviz BuildRequires: gtksourceview2-devel BuildRequires: libgnomecanvas-devel @@ -57,6 +58,7 @@ BuildRequires: why3 Requires: cpp Requires: graphviz +Requires: hicolor-icon-theme Requires: ltl2ba # This can be removed once F-19 goes EOL @@ -139,6 +141,7 @@ support. %prep %setup -q -n %{name}-%{pkgversion} %setup -q -T -D -a 1 -n %{name}-%{pkgversion} +%setup -q -T -D -a 14 -n %{name}-%{pkgversion} # Copy in the manuals mkdir doc/manuals @@ -168,9 +171,6 @@ sed -i 's/0\.82/0.83/g' configure src/wp/configure make \ OLINKFLAGS="-I +zarith -I +ocamlgraph -I +lablgtk2 -ccopt -Wl,-z,relro,-z,now" -# Remove spurious executable bits on generated files -chmod 0644 src/lib/dynlink_common_interface.ml src/lib/integer.ml - %install # Prevent rebuilds containing the buildroot when installing sed -i.orig 's/^headers::/headers:/' Makefile @@ -195,6 +195,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE3} mkdir -p %{buildroot}%{_datadir}/appdata install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/appdata +# Install the icons +mkdir -p %{buildroot}%{_datadir}/icons +cp -a icons %{buildroot}%{_datadir}/icons/hicolor + # Install and bytecompile the XEmacs file mkdir -p %{buildroot}%{_xemacs_sitelispdir} cp -p share/acsl.el %{buildroot}%{_xemacs_sitelispdir} @@ -219,6 +223,19 @@ rm -f %{buildroot}%{_libdir}/frama-c/*.{cmo,cmx,o} find %{buildroot}%{_datadir}/frama-c -type f -perm /0111 | \ xargs chmod a-x %{buildroot}%{_mandir}/man1/* +# Remove spurious executable bits on generated files +chmod 0644 src/lib/dynlink_common_interface.ml src/lib/integer.ml + +%post +update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %doc licenses/* VERSION %{_bindir}/* @@ -231,6 +248,7 @@ xargs chmod a-x %{buildroot}%{_mandir}/man1/* %{_datadir}/frama-c/ %{_datadir}/appdata/%{name}-gui.appdata.xml %{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/* %files doc @@ -260,6 +278,12 @@ xargs chmod a-x %{buildroot}%{_mandir}/man1/* %{_xemacs_sitelispdir}/acsl.el %changelog +* Mon Mar 24 2014 Jerry James - 1.10-2 +- Fix the icon name in the desktop file +- Install icons +- Drop unnecessary gmp-devel BR (pulled in by ocaml-zarith-devel) +- Fix permissions later, else they get reset to the bad values + * Mon Mar 17 2014 Jerry James - 1.10-1 - Update to Neon version - All patches have been upstreamed; drop them diff --git a/sources b/sources index 4cf0106..262bcc3 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -ac755dfefe551bf7d964aa69b6686299 frama-c-Neon-20140301_api.tar.gz c050eaf6f3acff2edf8edb44bf64976d frama-c-Neon-20140301.tar.gz +ac755dfefe551bf7d964aa69b6686299 frama-c-Neon-20140301_api.tar.gz 3ac995432474fbcc7787aaee17573e22 acsl-implementation-Neon-20140301.pdf 2c56d555d94fda814f85c9df1ba629e4 aorai-manual-Neon-20140301.pdf c7495b89ed2b99a8c596fb0eeeb8f781 metrics-manual-Neon-20140301.pdf @@ -8,3 +8,4 @@ a730e8487e3073393125e65c1165c506 rte-manual-Neon-20140301.pdf 6a56303db0c9c8dedb1520dafe971efa user-manual-Neon-20140301.pdf 5664248096c5cf58fddc6afb9616469d value-analysis-Neon-20140301.pdf 7105adc9b5c13108296d741a919fa2b2 wp-manual-Neon-20140301.pdf +458583247a2a66134de7feadb533c94b frama-c-icons.tar.xz