rpms/GtkAda/devel GtkAda-2.14.0-multilib_gtkada-config.patch, NONE, 1.1 GtkAda.spec, 1.30, 1.31

[Björn Persson]

Author: rombobeorn

Update of /cvs/pkgs/rpms/GtkAda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15307

Modified Files:
	GtkAda.spec 
Added Files:
	GtkAda-2.14.0-multilib_gtkada-config.patch 
Log Message:
Patched gtkada-config to look up the architecture at run time.

GtkAda-2.14.0-multilib_gtkada-config.patch:
 gtkada-config.in |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE GtkAda-2.14.0-multilib_gtkada-config.patch ---
--- src/tools/gtkada-config.in~	2009-11-25 01:44:30.000000000 +0100
+++ src/tools/gtkada-config.in	2009-11-25 01:44:30.000000000 +0100
@@ -1,9 +1,18 @@
 #!/bin/sh
 # @configure_input@
 
+case `uname --hardware-platform` in
+   x86_64|ppc64|s390x|sparc64|alpha|ia64)
+      lib=lib64
+      ;;
+   *)
+      lib=lib
+      ;;
+esac
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/gtkada
+libdir=${prefix}/${lib}/gtkada
 includedir=@includedir@/gtkada
 gtk_libs="@GTK_LIBS@"
 


Index: GtkAda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GtkAda/devel/GtkAda.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- GtkAda.spec	21 Nov 2009 15:42:35 -0000	1.30
+++ GtkAda.spec	29 Nov 2009 00:24:43 -0000	1.31
@@ -10,6 +10,8 @@ Source:         GtkAda-gpl-%{version}.tg
 Patch0:         GtkAda-gtk217.patch
 # Patch to make project files use fedora-gnat-project-common:
 Patch1:         GtkAda-2.14.0-multilib_gpr.patch
+# Patch to make gtkada-config use uname:
+Patch2:         GtkAda-2.14.0-multilib_gtkada-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-gnat
 BuildRequires:  libgnat
@@ -92,6 +94,7 @@ Documentation for GtkAda.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .gtk217
 %patch1
+%patch2
 # Replace "/usr/lib" with the appropriate architecture-specific directory, but
 # make an exception for "/usr/lib/gnat". Keep "$(prefix)" so that makeinstall
 # can insert the buildroot.
@@ -198,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Oct 20 2009 Björn Persson <bjorn at rombobjörn.se> - 2.14.0-2
-- Fixed project files for multilib systems.
+- Fixed project files and gtkada-config for multilib systems.
 
 * Sun Aug  9 2009 Gerard Milmeister <gemi at bluewin.ch> - 2.14.0-1
 - new release 2.14.0