[matreshka/f17] Fix projects names

Tue Apr 3 07:35:55 UTC 2012

commit 51bb1ad2a98cc254313b3bb0f184060646249a7f
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date:   Tue Apr 3 11:35:44 2012 +0400

    Fix projects names

 matreshka-gpr.patch |  148 +++++++++++++++++++++++++++++++++++++++++++++++++++
 matreshka.spec      |    5 ++-
 2 files changed, 152 insertions(+), 1 deletions(-)
---

diff --git a/matreshka-gpr.patch b/matreshka-gpr.patch
index 1b06aba..dedda3a 100644
--- a/matreshka-gpr.patch
+++ b/matreshka-gpr.patch
@@ -110,3 +110,151 @@
     for Library_Dir use Matreshka_Config.Library_Dir;
     for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
     for Externally_Built use "True";
+--- a/gnat/install/league.gpr	2012-04-03 10:21:37.671695962 +0400
++++ b/gnat/install/league.gpr	2012-04-03 10:22:05.894695118 +0400
+@@ -45,7 +45,7 @@
+ with "directories.gpr";
+ 
+ 
+-library project League is
++library project Matreshka_League is
+ 
+    Library_Name := "league" & Matreshka_Config.RTL_Version_Suffix;
+ 
+@@ -165,4 +165,4 @@
+ 
+    end Naming;
+ 
+-end League;
++end Matreshka_League;
+--- a/gnat/install/amf.gpr	2012-04-03 10:22:14.764694859 +0400
++++ b/gnat/install/amf.gpr	2012-04-03 10:22:37.268694188 +0400
+@@ -45,7 +45,7 @@
+ with "league.gpr";
+ with "xml.gpr";
+ 
+-library project AMF is
++library project Matreshka_AMF is
+ 
+    Library_Name := "matreshka-amf" & Matreshka_Config.RTL_Version_Suffix;
+ 
+@@ -56,4 +56,4 @@
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
+ 
+-end AMF;
++end Matreshka_AMF;
+--- a/gnat/install/amf_uml.gpr	2012-04-03 10:22:46.703693906 +0400
++++ b/gnat/install/amf_uml.gpr	2012-04-03 10:23:58.469691790 +0400
+@@ -42,18 +42,19 @@
+ --  $Revision: 2330 $ $Date: 2011-12-03 15:14:08 +0100 (Sat, 03 Dec 2011) $
+ ------------------------------------------------------------------------------
+ with "matreshka/matreshka_config.gpr";
+-with "league.gpr";
+-with "amf.gpr";
++with "matreshka_league.gpr";
++with "matreshka_amf.gpr";
++with "directories";
+ 
+-library project AMF_UML is
++library project Matreshka_AMF_UML is
+ 
+    Library_Name := "matreshka-amf-uml" & Matreshka_Config.RTL_Version_Suffix;
+ 
+    for Library_Kind use "dynamic";
+    for Library_Name use Library_Name;
+-   for Source_Dirs use ("../../include/matreshka/amf/uml");
++   for Source_Dirs use (Directories.Includedir & "/matreshka/amf/uml");
+    for Library_Dir use Matreshka_Config.Library_Dir;
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
+ 
+-end AMF_UML;
++end matreshka_AMF_UML;
+--- a/gnat/install/fastcgi.gpr	2012-04-03 10:24:06.689691529 +0400
++++ b/gnat/install/fastcgi.gpr	2012-04-03 10:24:25.396690973 +0400
+@@ -45,7 +45,7 @@
+ with "matreshka/matreshka_config.gpr";
+ with "matreshka_league.gpr";
+ 
+-library project FastCGI is
++library project Matreshka_FastCGI is
+ 
+    Library_Name := "matreshka-fastcgi" & Matreshka_Config.RTL_Version_Suffix;
+ 
+@@ -74,4 +74,4 @@
+ 
+    end Naming;
+ 
+-end FastCGI;
++end Matreshka_FastCGI;
+--- a/gnat/install/matreshka_config.gpr.in	2012-04-03 10:24:36.798690633 +0400
++++ b/gnat/install/matreshka_config.gpr.in	2012-04-03 10:24:50.805690161 +0400
+@@ -41,7 +41,7 @@
+ ------------------------------------------------------------------------------
+ --  $Revision: 2143 $ $Date: 2011-10-10 10:03:31 +0200 (Mon, 10 Oct 2011) $
+ ------------------------------------------------------------------------------
+-
++with "directories";
+ abstract project Matreshka_Config is
+ 
+    Version := "0.2.0";
+--- a/gnat/install/sql.gpr	2012-04-03 10:24:57.394690020 +0400
++++ b/gnat/install/sql.gpr	2012-04-03 10:25:13.171689551 +0400
+@@ -45,7 +45,7 @@
+ with "directories.gpr";
+ with "matreshka_league.gpr";
+ 
+-library project SQL is
++library project Matreshka_SQL is
+ 
+    Library_Name := "matreshka-sql" & Matreshka_Config.RTL_Version_Suffix;
+ 
+@@ -56,4 +56,4 @@
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
+ 
+-end SQL;
++end Matreshka_SQL;
+--- a/gnat/install/sql_sqlite3.gpr	2012-04-03 10:25:47.347688535 +0400
++++ b/gnat/install/sql_sqlite3.gpr	2012-04-03 10:26:45.283686811 +0400
+@@ -47,7 +47,7 @@
+ with "matreshka_league.gpr";
+ 
+ 
+-library project SQL_SQLite3 is
++library project Matreshka_SQL_SQLite3 is
+ 
+    Library_Name := "matreshka-sql-sqlite3" & Matreshka_Config.RTL_Version_Suffix;
+ 
+@@ -58,4 +58,4 @@
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
+ 
+-end SQL_SQLite3;
++end Matreshka_SQL_SQLite3;
+--- a/gnat/install/xml.gpr	2012-04-03 10:26:50.865686645 +0400
++++ b/gnat/install/xml.gpr	2012-04-03 10:27:45.283685026 +0400
+@@ -42,17 +42,17 @@
+ --  $Revision: 2327 $ $Date: 2011-12-03 14:58:21 +0100 (Sat, 03 Dec 2011) $
+ ------------------------------------------------------------------------------
+ with "matreshka/matreshka_config.gpr";
+-with "league.gpr";
+-
+-library project XML is
++with "matreshka_league.gpr";
++with "directories";
++library project matreshka_XML is
+ 
+    Library_Name := "matreshka-xml" & Matreshka_Config.RTL_Version_Suffix;
+ 
+    for Library_Kind use "dynamic";
+    for Library_Name use Library_Name;
+-   for Source_Dirs use ("../../include/matreshka/xml");
++   for Source_Dirs use (Directories.LibDir & "/include/matreshka/xml");
+    for Library_Dir use Matreshka_Config.Library_Dir;
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
+ 
+-end XML;
++end matreshka_XML;
diff --git a/matreshka.spec b/matreshka.spec
index 3ed324f..6640308 100644
--- a/matreshka.spec
+++ b/matreshka.spec
@@ -1,6 +1,6 @@
 Name:       matreshka
 Version:    0.2.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Set of Ada libraries to help to develop information systems
 Group:      System Environment/Libraries
 License:    BSD
@@ -382,6 +382,9 @@ cd %{buildroot}%{_GNAT_project_dir} && for file in $(ls *.gpr); do mv $file matr
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Apr 3 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.2.0-4
+- Fix projects names
+
 * Sun Mar 24 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.2.0-3
 - Update to 0.2.0
 - Fix filelist
