[GtkAda] Updated for fedora-gnat-project-common 3.

[Björn Persson]

commit ec2c4de08156886fd6a8355a2e001f9d09c8363a
Author: Björn Persson <bjorn at rombobjörn.se>
Date:   Tue May 3 22:12:28 2011 +0200

    Updated for fedora-gnat-project-common 3.

 GtkAda-2.14.1-multilib_gpr.patch |    6 +++---
 GtkAda.spec                      |   11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/GtkAda-2.14.1-multilib_gpr.patch b/GtkAda-2.14.1-multilib_gpr.patch
index 40c4840..d075218 100644
--- a/GtkAda-2.14.1-multilib_gpr.patch
+++ b/GtkAda-2.14.1-multilib_gpr.patch
@@ -1,11 +1,11 @@
 --- projects/generate_prj.sh	2010-09-25 22:47:31.000000000 +0200
-+++ projects/generate_prj.sh	2010-09-25 22:42:39.000000000 +0200
++++ projects/generate_prj.sh	2011-05-03 19:16:47.000000000 +0200
 @@ -3,7 +3,7 @@
  module=${1:-}
  bindir="$2"
  incdir="$3"
 -libdir="$4"
-+libdir="/usr/\" & Common.Lib & \""
++libdir="\" & Directories.Libdir & \""
  libsubdir_static="$5"
  libsubdir_shared="$6"
  alisubdir_static="$7"
@@ -22,7 +22,7 @@
    default=$3
  
    cat <<EOF > ${lc}.gpr
-+with "common";
++with "directories";
  project ${uc} is
  
     type Gtkada_Kind_Type is ("static", "relocatable");
diff --git a/GtkAda.spec b/GtkAda.spec
index a349686..9142aaf 100644
--- a/GtkAda.spec
+++ b/GtkAda.spec
@@ -40,7 +40,7 @@ BuildRequires:  texinfo-tex
 BuildRequires:  texinfo
 BuildRequires:  tetex
 BuildRequires:  tetex-dvips
-BuildRequires:  fedora-gnat-project-common
+BuildRequires:  fedora-gnat-project-common >= 3
 # gcc-gnat is only available on these architectures:
 ExclusiveArch:  %{ix86} x86_64 ia64 ppc ppc64 alpha
 
@@ -109,12 +109,8 @@ Documentation for GtkAda.
 find -name .cvsignore | xargs rm -fr
 
 %build
-# adapt opt flags to gnatmake
-GNAT_RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|--param=ssp-buffer-size=4||'`
-sed -i "s|GNATFLAGS =|GNATFLAGS = $GNAT_RPM_OPT_FLAGS |" src/Makefile.common*
 %configure --enable-build=Debuginfo --disable-subdirs --disable-static
-sed -i 's|--param=ssp-buffer-size=4||' testgtk/Makefile
-make
+make GNATMAKE="gnatmake %{Gnatmake_optflags}"
 make -C docs
 
 
@@ -195,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 03 2011 Björn Persson <bjorn at rombobjörn.se> - 2.14.1-7
+- Updated for fedora-gnat-project-common 3.
+
 * Wed Mar 09 2011 Björn Persson <bjorn at rombobjörn.se> - 2.14.1-6
 - Corrected dependencies.
 - Put the sublibraries in the right group.