landgraf pushed to gnatcoll (f21). "Fix library_dir option"

[notifications at fedoraproject.org]

>From d234043d4d65858ab032951ebad18b944aec442a Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Tue, 31 Mar 2015 12:57:45 +0200
Subject: Fix library_dir option


diff --git a/gnatcoll-2013-directories.patch b/gnatcoll-2013-directories.patch
index 660a870..4ce2cff 100644
--- a/gnatcoll-2013-directories.patch
+++ b/gnatcoll-2013-directories.patch
@@ -11,7 +11,7 @@ index 1ddb6cd..9813d12 100644
     for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
     for Library_Kind use GnatColl_Kind;
 -   for Library_Dir  use Libdir;
-+   for Library_Dir use Directories.Libdir & "/gnatcoll/";
++   for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
     for Library_Version use
        "lib" & Project'Library_Name & So_Ext & "." & Version;
  
@@ -28,7 +28,7 @@ index 3d4b3e4..610a45a 100644
     for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
     for Library_Kind use GnatColl_Kind;
 -   for Library_Dir  use Libdir;
-+   for Library_Dir use Directories.Libdir & "/gnatcoll/";
++   for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
     for Library_Version use
        "lib" & Project'Library_Name & So_Ext & "." & Version;
  
@@ -47,7 +47,7 @@ index 28b0c2d..e23f52f 100644
     for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
     for Library_Kind use GnatColl.GnatColl_Kind;
 -   for Library_Dir  use "../gnatcoll/" & Project'Library_Kind;
-+   for Library_Dir use Directories.Libdir & "/gnatcoll/";
++   for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
     for Library_Version use
       "lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
  
@@ -105,7 +105,7 @@ index 2cf696a..6660c43 100644
     for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
     for Library_Kind use GnatColl.GnatColl_Kind;
 -   for Library_Dir  use GnatColl.Libdir;
-+   for Library_Dir use Directories.Libdir & "/gnatcoll/";
++   for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
     for Library_Version use
       "lib" & Project'Library_Name & GnatColl.So_Ext & "." & Gnatcoll.Version;
  
diff --git a/gnatcoll.spec b/gnatcoll.spec
index ef4d851..e09a8a9 100644
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@ -1,6 +1,6 @@
 Name:       gnatcoll
 Version:    2013
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    Suite of reusable software components and utilities
 Group:      System Environment/Libraries
 License:    GPLv2+
@@ -99,6 +99,9 @@ rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
 
 
 %changelog
+* Tue Mar 31 2015 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-10
+- Fix library dir 
+
 * Sat Oct 11 2014 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-9
 - Do not build on arm 
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnatcoll.git/commit/?h=f21&id=d234043d4d65858ab032951ebad18b944aec442a