From 850aa978f93c3dfd11bcd996d609719a3fcf33b7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 24 2011 20:12:02 +0000 Subject: Add patch for gnat 4.6 support --- diff --git a/plplot-5.9.7-gnat46.patch b/plplot-5.9.7-gnat46.patch new file mode 100644 index 0000000..d11b8b6 --- /dev/null +++ b/plplot-5.9.7-gnat46.patch @@ -0,0 +1,11 @@ +--- plplot-5.9.7/cmake/modules/ada.cmake.gnat46 2010-10-03 07:11:57.000000000 -0600 ++++ plplot-5.9.7/cmake/modules/ada.cmake 2011-01-24 13:10:48.733012276 -0700 +@@ -43,7 +43,7 @@ + endif(ENABLE_ada) + + if(ENABLE_ada) +- find_library(GNAT_LIB NAMES gnat gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) ++ find_library(GNAT_LIB NAMES gnat gnat-4.6 gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) + if(NOT GNAT_LIB) + message(STATUS "WARNING: " + "gnat library not found. Disabling ada bindings") diff --git a/plplot.spec b/plplot.spec index 1699e51..c14dd41 100644 --- a/plplot.spec +++ b/plplot.spec @@ -31,6 +31,7 @@ Group: Applications/Engineering License: LGPLv2+ URL: http://plplot.sourceforge.net/ Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz +Patch0: plplot-5.9.7-gnat46.patch Patch1: plplot-5.9.7-multiarch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -319,6 +320,7 @@ Requires: pkgconfig %prep %setup -q +%patch0 -p1 -b .gnat46 %patch1 -p1 -b .multiarch # Convert to UTF-8 for file in ChangeLog NEWS @@ -697,6 +699,7 @@ fi %changelog * Mon Jan 24 2011 Orion Poplawski - 5.9.7-5 - Rebuild for new libgnat +- Add patch for gnat 4.6 support * Wed Jan 5 2011 Orion Poplawski - 5.9.7-4 - Rebuild for new ocaml