[matreshka] fixes to get 0.4.0 building, fails %check though...
Tom Callaway
spot at fedoraproject.org
Thu Apr 25 21:03:37 UTC 2013
commit a29bc9ef73d1e6a499980a5ef940430fd8938935
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Apr 25 17:02:59 2013 -0400
fixes to get 0.4.0 building, fails %check though...
.gitignore | 1 +
matreshka-0.4.0_gpr.patch | 298 ++++++++++++++++++++++++++++++++++++++++
matreshka-0.4.0_gprnames.patch | 291 +++++++++++++++++++++++++++++++++++++++
matreshka.spec | 13 +-
sources | 2 +-
5 files changed, 598 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a647cb6..bae4693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/matreshka-0.1.1.tar.gz
/matreshka-0.3.0.tar.gz
+/matreshka-0.4.0.tar.gz
diff --git a/matreshka-0.4.0_gpr.patch b/matreshka-0.4.0_gpr.patch
new file mode 100644
index 0000000..845abd7
--- /dev/null
+++ b/matreshka-0.4.0_gpr.patch
@@ -0,0 +1,298 @@
+diff -up matreshka-0.4.0/gnat/install/matreshka_amf.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_amf.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_amf.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_amf.gpr 2013-04-25 16:32:17.841940098 -0400
+@@ -41,11 +41,12 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ 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 +57,4 @@ library project AMF is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF;
++end matreshka_amf;
+diff -up matreshka-0.4.0/gnat/install/matreshka_amf_mofext.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_amf_mofext.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_amf_mofext.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_amf_mofext.gpr 2013-04-25 16:32:17.841940098 -0400
+@@ -41,12 +41,13 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "amf.gpr";
+ with "amf_uml.gpr";
+
+-library project AMF_MOFEXT is
++library project matreshka_amf_mofext is
+
+ Library_Name := "matreshka-amf-mofext" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -57,4 +58,4 @@ library project AMF_MOFEXT is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_MOFEXT;
++end matreshka_amf_mofext;
+diff -up matreshka-0.4.0/gnat/install/matreshka_amf_ocl.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_amf_ocl.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_amf_ocl.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_amf_ocl.gpr 2013-04-25 16:32:17.841940098 -0400
+@@ -41,12 +41,13 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "amf.gpr";
+ with "amf_uml.gpr";
+
+-library project AMF_OCL is
++library project matreshka_amf_ocl is
+
+ Library_Name := "matreshka-amf-ocl" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -57,4 +58,4 @@ library project AMF_OCL is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_OCL;
++end matreshka_amf_ocl;
+diff -up matreshka-0.4.0/gnat/install/matreshka_amf_uml.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_amf_uml.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_amf_uml.gpr.gprfix 2012-11-13 03:47:36.774931000 -0500
++++ matreshka-0.4.0/gnat/install/matreshka_amf_uml.gpr 2013-04-25 16:32:59.602940724 -0400
+@@ -41,12 +41,13 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 3403 $ $Date: 2012-11-13 12:47:36 +0400 (Tue, 13 Nov 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "amf.gpr";
+ with "amf_dd.gpr";
+
+-library project AMF_UML is
++library project matreshka_amf_ocl is
+
+ Library_Name := "matreshka-amf-uml" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -57,4 +58,4 @@ library project AMF_UML is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_UML;
++end matreshka_amf_uml;
+diff -up matreshka-0.4.0/gnat/install/matreshka_amf_utp.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_amf_utp.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_amf_utp.gpr.gprfix 2012-04-06 17:46:48.059682000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_amf_utp.gpr 2013-04-25 16:32:17.843940098 -0400
+@@ -41,12 +41,13 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2813 $ $Date: 2012-04-07 01:46:48 +0400 (Sat, 07 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "amf.gpr";
+ with "amf_uml.gpr";
+
+-library project AMF_UTP is
++library project matreshka_amf_utp is
+
+ Library_Name := "matreshka-amf-utp" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -57,4 +58,4 @@ library project AMF_UTP is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_UTP;
++end matreshka_amf_utp;
+diff -up matreshka-0.4.0/gnat/install/matreshka_fastcgi.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_fastcgi.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_fastcgi.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_fastcgi.gpr 2013-04-25 16:32:17.843940098 -0400
+@@ -41,10 +41,11 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+
+-library project FastCGI is
++library project matreshka_fastcgi is
+
+ Library_Name := "matreshka-fastcgi" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -73,4 +74,4 @@ library project FastCGI is
+
+ end Naming;
+
+-end FastCGI;
++end matreshka_fastcgi;
+diff -up matreshka-0.4.0/gnat/install/matreshka_league.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_league.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_league.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_league.gpr 2013-04-25 16:32:17.843940098 -0400
+@@ -41,9 +41,10 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+
+-library project League is
++library project matreshka_league is
+
+ Library_Name := "league" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -163,4 +164,4 @@ library project League is
+
+ end Naming;
+
+-end League;
++end matreshka_league;
+diff -up matreshka-0.4.0/gnat/install/matreshka_sql_firebird.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_sql_firebird.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_sql_firebird.gpr.gprfix 2013-04-25 16:32:17.844940098 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_sql_firebird.gpr 2013-04-25 16:33:37.434941292 -0400
+@@ -41,11 +41,12 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: $ $Date: $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "sql.gpr";
+
+-library project SQL_Firebird is
++library project matreshka_sql_firebird is
+
+ Library_Name := "matreshka-sql-firebird" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -64,4 +65,4 @@ library project SQL_Firebird is
+ for Linker_Options use Matreshka_Config.Firebird_Library_Options;
+ end Linker;
+
+-end SQL_Firebird;
++end matreshka_sql_firebird;
+diff -up matreshka-0.4.0/gnat/install/matreshka_sql.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_sql.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_sql.gpr.gprfix 2012-04-03 15:34:17.157717000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_sql.gpr 2013-04-25 16:32:17.845940098 -0400
+@@ -41,10 +41,11 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2795 $ $Date: 2012-04-03 23:34:17 +0400 (Tue, 03 Apr 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+
+-library project SQL is
++library project matreshka_sql is
+
+ Library_Name := "matreshka-sql" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,4 @@ library project SQL is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end SQL;
++end matreshka_sql;
+diff -up matreshka-0.4.0/gnat/install/matreshka_sql_oracle.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_sql_oracle.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_sql_oracle.gpr.gprfix 2013-04-25 16:32:17.845940098 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_sql_oracle.gpr 2013-04-25 16:34:15.078941857 -0400
+@@ -41,11 +41,12 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 3324 $ $Date: 2012-11-09 23:58:25 +0400 (Fri, 09 Nov 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "sql.gpr";
+
+-library project SQL_Oracle is
++library project matreshka_sql_oracle is
+
+ Library_Name := "matreshka-sql-oci" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -64,4 +65,4 @@ library project SQL_Oracle is
+ for Linker_Options use Matreshka_Config.OCI_Library_Options;
+ end Linker;
+
+-end SQL_Oracle;
++end matreshka_sql_oracle;
+diff -up matreshka-0.4.0/gnat/install/matreshka_sql_postgresql.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_sql_postgresql.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_sql_postgresql.gpr.gprfix 2013-04-25 16:32:17.846940098 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_sql_postgresql.gpr 2013-04-25 16:34:48.527942359 -0400
+@@ -41,11 +41,12 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 3324 $ $Date: 2012-11-09 23:58:25 +0400 (Fri, 09 Nov 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "sql.gpr";
+
+-library project SQL_PostgreSQL is
++library project matreshka_sql_postgresql is
+
+ Library_Name := "matreshka-sql-postgresql" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -64,4 +65,4 @@ library project SQL_PostgreSQL is
+ for Linker_Options use Matreshka_Config.PostgreSQL_Library_Options;
+ end Linker;
+
+-end SQL_PostgreSQL;
++end matreshka_sql_postgresql;
+diff -up matreshka-0.4.0/gnat/install/matreshka_sql_sqlite3.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_sql_sqlite3.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_sql_sqlite3.gpr.gprfix 2013-04-25 16:32:17.846940098 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_sql_sqlite3.gpr 2013-04-25 16:35:26.751942932 -0400
+@@ -41,11 +41,12 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 3324 $ $Date: 2012-11-09 23:58:25 +0400 (Fri, 09 Nov 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+ with "sql.gpr";
+
+-library project SQL_SQLite3 is
++library project matreshka_sql_sqlite3 is
+
+ Library_Name := "matreshka-sql-sqlite3" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -64,4 +65,4 @@ library project SQL_SQLite3 is
+ for Linker_Options use Matreshka_Config.SQLite3_Library_Options;
+ end Linker;
+
+-end SQL_SQLite3;
++end matreshka_sql_sqlite3;
+diff -up matreshka-0.4.0/gnat/install/matreshka_xml.gpr.gprfix matreshka-0.4.0/gnat/install/matreshka_xml.gpr
+--- matreshka-0.4.0/gnat/install/matreshka_xml.gpr.gprfix 2012-09-28 13:01:17.393597000 -0400
++++ matreshka-0.4.0/gnat/install/matreshka_xml.gpr 2013-04-25 16:35:50.067943282 -0400
+@@ -41,10 +41,11 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 3110 $ $Date: 2012-09-28 21:01:17 +0400 (Fri, 28 Sep 2012) $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+
+-library project XML is
++library project matreshka_xml is
+
+ Library_Name := "matreshka-xml" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,4 @@ library project XML is
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end XML;
++end matreshka_xml;
diff --git a/matreshka-0.4.0_gprnames.patch b/matreshka-0.4.0_gprnames.patch
new file mode 100644
index 0000000..abfd794
--- /dev/null
+++ b/matreshka-0.4.0_gprnames.patch
@@ -0,0 +1,291 @@
+diff -up matreshka-0.4.0/Makefile.install.names matreshka-0.4.0/Makefile.install
+--- matreshka-0.4.0/Makefile.install.names 2012-11-26 04:53:43.114514000 -0500
++++ matreshka-0.4.0/Makefile.install 2013-04-25 16:51:30.714957396 -0400
+@@ -58,7 +58,7 @@ endif
+ cat league-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/league
+ cat league-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+ $(INSTALL_project) gnat/install/matreshka_config.gpr $(INSTALL_PROJECT_DIR)/matreshka/matreshka_config.gpr
+- $(INSTALL_project) gnat/install/league.gpr $(INSTALL_PROJECT_DIR)/league.gpr
++ $(INSTALL_project) gnat/install/matreshka_league.gpr $(INSTALL_PROJECT_DIR)/matreshka_league.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libleague$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libleague$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libleague$(RTL_VERSION).$(LIBEXT).$(VERSION) libleague$(RTL_VERSION).$(LIBEXT)
+@@ -70,7 +70,7 @@ endif
+ cat league-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/league/{}" > .objs/league-devel.files
+ cat league-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/league-devel.files
+ echo "%attr(-,root,root) %{_gprdir}/matreshka/matreshka_config.gpr" >> .objs/league-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/league.gpr" >> .objs/league-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_league.gpr" >> .objs/league-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libleague$(RTL_VERSION).$(LIBEXT)" >> .objs/league-devel.files
+
+ fastcgi:
+@@ -80,7 +80,7 @@ fastcgi:
+ gnat ls -o -P gnat/matreshka_fastcgi.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > fastcgi-ali.lst
+ cat fastcgi-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/fastcgi
+ cat fastcgi-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/fastcgi.gpr $(INSTALL_PROJECT_DIR)/fastcgi.gpr
++ $(INSTALL_project) gnat/install/matreshka_fastcgi.gpr $(INSTALL_PROJECT_DIR)/matreshka_fastcgi.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-fastcgi$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-fastcgi$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-fastcgi$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-fastcgi$(RTL_VERSION).$(LIBEXT)
+@@ -91,7 +91,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat fastcgi-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/fastcgi/{}" > .objs/fastcgi-devel.files
+ cat fastcgi-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/fastcgi-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/fastcgi.gpr" >> .objs/fastcgi-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_fastcgi.gpr" >> .objs/fastcgi-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-fastcgi$(RTL_VERSION).$(LIBEXT)" >> .objs/fastcgi-devel.files
+
+ soap:
+@@ -101,7 +101,7 @@ soap:
+ gnat ls -o -P gnat/matreshka_soap.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > soap-ali.lst
+ cat soap-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/soap
+ cat soap-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/soap.gpr $(INSTALL_PROJECT_DIR)/soap.gpr
++ $(INSTALL_project) gnat/install/matreshka_soap.gpr $(INSTALL_PROJECT_DIR)/matreshka_soap.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-soap$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-soap$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-soap$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-soap$(RTL_VERSION).$(LIBEXT)
+@@ -112,7 +112,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat soap-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/soap/{}" > .objs/soap-devel.files
+ cat soap-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/soap-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/soap.gpr" >> .objs/soap-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_soap.gpr" >> .objs/soap-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-soap$(RTL_VERSION).$(LIBEXT)" >> .objs/soap-devel.files
+
+ wsse:
+@@ -122,7 +122,7 @@ wsse:
+ gnat ls -o -P gnat/matreshka_soap_wsse.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > soap_wsse-ali.lst
+ cat soap_wsse-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/soap/wsse
+ cat soap_wsse-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/soap_wsse.gpr $(INSTALL_PROJECT_DIR)/soap_wsse.gpr
++ $(INSTALL_project) gnat/install/matreshka_soap_wsse.gpr $(INSTALL_PROJECT_DIR)/matreshka_soap_wsse.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-soap-wsse$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-soap-wsse$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-soap-wsse$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-soap-wsse$(RTL_VERSION).$(LIBEXT)
+@@ -133,7 +133,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat soap_wsse-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/soap/wsse/{}" > .objs/soap_wsse-devel.files
+ cat soap_wsse-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/soap_wsse-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/soap_wsse.gpr" >> .objs/soap_wsse-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_soap_wsse.gpr" >> .objs/soap_wsse-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-soap-wsse$(RTL_VERSION).$(LIBEXT)" >> .objs/soap_wsse-devel.files
+
+ wsdl2ada:
+@@ -147,7 +147,7 @@ sql:
+ gnat ls -o -P gnat/matreshka_sql.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > sql-ali.lst
+ cat sql-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/sql
+ cat sql-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/sql.gpr $(INSTALL_PROJECT_DIR)/sql.gpr
++ $(INSTALL_project) gnat/install/matreshka_sql.gpr $(INSTALL_PROJECT_DIR)/matreshka_sql.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-sql$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-sql$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-sql$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-sql$(RTL_VERSION).$(LIBEXT)
+@@ -158,7 +158,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat sql-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/sql/{}" > .objs/sql-devel.files
+ cat sql-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/sql-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/sql.gpr" >> .objs/sql-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_sql.gpr" >> .objs/sql-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-sql$(RTL_VERSION).$(LIBEXT)" >> .objs/sql-devel.files
+
+ oci:
+@@ -168,7 +168,7 @@ oci:
+ gnat ls -o -P gnat/matreshka_sql_oracle.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > sql_oci-ali.lst
+ cat sql_oci-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/sql/oci
+ cat sql_oci-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/sql_oracle.gpr $(INSTALL_PROJECT_DIR)/sql_oracle.gpr
++ $(INSTALL_project) gnat/install/matreshka_sql_oracle.gpr $(INSTALL_PROJECT_DIR)/matreshka_sql_oracle.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-sql-oci$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-sql-oci$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-sql-oci$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-sql-oci$(RTL_VERSION).$(LIBEXT)
+@@ -179,7 +179,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat sql_oci-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/sql/oci/{}" > .objs/sql_oci-devel.files
+ cat sql_oci-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/sql_oci-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/sql_oracle.gpr" >> .objs/sql_oci-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_sql_oracle.gpr" >> .objs/sql_oci-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-sql-oci$(RTL_VERSION).$(LIBEXT)" >> .objs/sql_oci-devel.files
+
+ postgresql:
+@@ -189,7 +189,7 @@ postgresql:
+ gnat ls -o -P gnat/matreshka_sql_postgresql.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > sql_postgresql-ali.lst
+ cat sql_postgresql-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/sql/postgresql
+ cat sql_postgresql-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/sql_postgresql.gpr $(INSTALL_PROJECT_DIR)/sql_postgresql.gpr
++ $(INSTALL_project) gnat/install/matreshka_sql_postgresql.gpr $(INSTALL_PROJECT_DIR)/matreshka_sql_postgresql.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-sql-postgresql$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-sql-postgresql$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-sql-postgresql$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-sql-postgresql$(RTL_VERSION).$(LIBEXT)
+@@ -200,7 +200,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat sql_postgresql-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/sql/postgresql/{}" > .objs/sql_postgresql-devel.files
+ cat sql_postgresql-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/sql_postgresql-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/sql_postgresql.gpr" >> .objs/sql_postgresql-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_sql_postgresql.gpr" >> .objs/sql_postgresql-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-sql-postgresql$(RTL_VERSION).$(LIBEXT)" >> .objs/sql_postgresql-devel.files
+
+ sqlite3:
+@@ -210,7 +210,7 @@ sqlite3:
+ gnat ls -o -P gnat/matreshka_sql_sqlite3.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > sql_sqlite3-ali.lst
+ cat sql_sqlite3-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/sql/sqlite3
+ cat sql_sqlite3-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/sql_sqlite3.gpr $(INSTALL_PROJECT_DIR)/sql_sqlite3.gpr
++ $(INSTALL_project) gnat/install/matreshka_sql_sqlite3.gpr $(INSTALL_PROJECT_DIR)/matreshka_sql_sqlite3.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-sql-sqlite3$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-sql-sqlite3$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-sql-sqlite3$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-sql-sqlite3$(RTL_VERSION).$(LIBEXT)
+@@ -221,7 +221,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat sql_sqlite3-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/sql/sqlite3/{}" > .objs/sql_sqlite3-devel.files
+ cat sql_sqlite3-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/sql_sqlite3-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/sql_sqlite3.gpr" >> .objs/sql_sqlite3-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_sql_sqlite3.gpr" >> .objs/sql_sqlite3-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-sql-sqlite3$(RTL_VERSION).$(LIBEXT)" >> .objs/sql_sqlite3-devel.files
+
+ firebird:
+@@ -231,7 +231,7 @@ firebird:
+ gnat ls -o -P gnat/matreshka_sql_firebird.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > sql_firebird-ali.lst
+ cat sql_firebird-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/sql/firebird
+ cat sql_firebird-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/sql_firebird.gpr $(INSTALL_PROJECT_DIR)/sql_firebird.gpr
++ $(INSTALL_project) gnat/install/matreshka_sql_firebird.gpr $(INSTALL_PROJECT_DIR)/matreshka_sql_firebird.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-sql-firebird$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-sql-firebird$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-sql-firebird$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-sql-firebird$(RTL_VERSION).$(LIBEXT)
+@@ -242,7 +242,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat sql_firebird-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/sql/firebird/{}" > .objs/sql_firebird-devel.files
+ cat sql_firebird-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/sql_firebird-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/sql_firebird.gpr" >> .objs/sql_firebird-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_sql_firebird.gpr" >> .objs/sql_firebird-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-sql-firebird$(RTL_VERSION).$(LIBEXT)" >> .objs/sql_firebird-devel.files
+
+ xml:
+@@ -252,7 +252,7 @@ xml:
+ gnat ls -o -P gnat/matreshka_xml.gpr | sort | uniq | grep -v '^$$' | sed -e 's/.o$$/.ali/' > xml-ali.lst
+ cat xml-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/xml
+ cat xml-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+- $(INSTALL_project) gnat/install/xml.gpr $(INSTALL_PROJECT_DIR)/xml.gpr
++ $(INSTALL_project) gnat/install/matreshka_xml.gpr $(INSTALL_PROJECT_DIR)/matreshka_xml.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-xml$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-xml$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-xml$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-xml$(RTL_VERSION).$(LIBEXT)
+@@ -263,7 +263,7 @@ else ifeq ($(OPERATING_SYSTEM), Windows)
+ endif
+ cat xml-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/xml/{}" > .objs/xml-devel.files
+ cat xml-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/xml-devel.files
+- echo "%attr(-,root,root) %{_gprdir}/xml.gpr" >> .objs/xml-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_xml.gpr" >> .objs/xml-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-xml$(RTL_VERSION).$(LIBEXT)" >> .objs/xml-devel.files
+
+ amf:
+@@ -278,7 +278,7 @@ amf:
+ $(INSTALL_data) source/amf/mof/metamodels/mapping.xml $(INSTALL_SHARE_DIR)/amf/metamodels/mapping.xml
+ $(INSTALL_data) source/amf/mof/metamodels/CMOF24.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/CMOF24.cmof
+ $(INSTALL_data) source/amf/mof/models/mapping.xml $(INSTALL_SHARE_DIR)/amf/models/mapping.xml
+- $(INSTALL_project) gnat/install/amf.gpr $(INSTALL_PROJECT_DIR)/amf.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf$(RTL_VERSION).$(LIBEXT)
+@@ -292,7 +292,7 @@ endif
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/mapping.xml" >> .objs/amf-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/CMOF24.cmof" >> .objs/amf-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/models/mapping.xml" >> .objs/amf-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf.gpr" >> .objs/amf-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf.gpr" >> .objs/amf-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf$(RTL_VERSION).$(LIBEXT)" >> .objs/amf-devel.files
+
+ dd:
+@@ -305,7 +305,7 @@ dd:
+ $(INSTALL_data) source/amf/dd/metamodels/DC10.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/DC10.cmof
+ $(INSTALL_data) source/amf/dd/metamodels/DG10.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/DG10.cmof
+ $(INSTALL_data) source/amf/dd/metamodels/DI10.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/DI10.cmof
+- $(INSTALL_project) gnat/install/amf_dd.gpr $(INSTALL_PROJECT_DIR)/amf_dd.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf_dd.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf_dd.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf-dd$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf-dd$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf-dd$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf-dd$(RTL_VERSION).$(LIBEXT)
+@@ -319,7 +319,7 @@ endif
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/DC10.cmof" >> .objs/amf_dd-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/DG10.cmof" >> .objs/amf_dd-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/DI10.cmof" >> .objs/amf_dd-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf_dd.gpr" >> .objs/amf_dd-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf_dd.gpr" >> .objs/amf_dd-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf-dd$(RTL_VERSION).$(LIBEXT)" >> .objs/amf_dd-devel.files
+
+ uml:
+@@ -341,7 +341,7 @@ uml:
+ $(INSTALL_data) source/amf/uml/models/UML24/StandardProfileL2.xmi $(INSTALL_SHARE_DIR)/amf/models/UML24/StandardProfileL2.xmi
+ $(INSTALL_data) source/amf/uml/models/UML24/StandardProfileL3.xmi $(INSTALL_SHARE_DIR)/amf/models/UML24/StandardProfileL3.xmi
+ $(INSTALL_data) source/amf/uml/models/UML24/UML.xmi $(INSTALL_SHARE_DIR)/amf/models/UML24/UML.xmi
+- $(INSTALL_project) gnat/install/amf_uml.gpr $(INSTALL_PROJECT_DIR)/amf_uml.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf_uml.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf_uml.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf-uml$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf-uml$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf-uml$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf-uml$(RTL_VERSION).$(LIBEXT)
+@@ -362,7 +362,7 @@ endif
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/models/UML24/StandardProfileL2.xmi" >> .objs/amf_uml-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/models/UML24/StandardProfileL3.xmi" >> .objs/amf_uml-lib.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/models/UML24/UML.xmi" >> .objs/amf_uml-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf_uml.gpr" >> .objs/amf_uml-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf_uml.gpr" >> .objs/amf_uml-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf-uml$(RTL_VERSION).$(LIBEXT)" >> .objs/amf_uml-devel.files
+
+ ocl:
+@@ -373,7 +373,7 @@ ocl:
+ cat amf_ocl-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/amf/ocl
+ cat amf_ocl-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+ $(INSTALL_data) source/amf/ocl/metamodels/OCL23.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/OCL23.cmof
+- $(INSTALL_project) gnat/install/amf_ocl.gpr $(INSTALL_PROJECT_DIR)/amf_ocl.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf_ocl.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf_ocl.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf-ocl$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf-ocl$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf-ocl$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf-ocl$(RTL_VERSION).$(LIBEXT)
+@@ -385,7 +385,7 @@ endif
+ cat amf_ocl-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/amf/ocl/{}" > .objs/amf_ocl-devel.files
+ cat amf_ocl-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/amf_ocl-devel.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/OCL23.cmof" >> .objs/amf_ocl-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf_ocl.gpr" >> .objs/amf_ocl-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf_ocl.gpr" >> .objs/amf_ocl-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf-ocl$(RTL_VERSION).$(LIBEXT)" >> .objs/amf_ocl-devel.files
+
+ utp:
+@@ -396,7 +396,7 @@ utp:
+ cat amf_utp-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/amf/utp
+ cat amf_utp-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+ $(INSTALL_data) source/amf/utp/metamodels/UTPSA11.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/UTPSA11.cmof
+- $(INSTALL_project) gnat/install/amf_utp.gpr $(INSTALL_PROJECT_DIR)/amf_utp.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf_utp.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf_utp.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf-utp$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf-utp$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf-utp$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf-utp$(RTL_VERSION).$(LIBEXT)
+@@ -408,7 +408,7 @@ endif
+ cat amf_utp-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/amf/utp/{}" > .objs/amf_utp-devel.files
+ cat amf_utp-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/amf_utp-devel.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/UTPSA11.cmof" >> .objs/amf_utp-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf_utp.gpr" >> .objs/amf_utp-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf_utp.gpr" >> .objs/amf_utp-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf-utp$(RTL_VERSION).$(LIBEXT)" >> .objs/amf_utp-devel.files
+
+ mofext:
+@@ -419,7 +419,7 @@ mofext:
+ cat amf_mofext-src.lst | tr '\\' '/' | xargs -I sources $(INSTALL_source) sources $(INSTALL_INCLUDE_DIR)/amf/mofext
+ cat amf_mofext-ali.lst | tr '\\' '/' | xargs -I alis $(INSTALL_ali) alis $(INSTALL_ALI_DIR)
+ $(INSTALL_data) source/amf/mofext/metamodels/MOFEXT241.cmof $(INSTALL_SHARE_DIR)/amf/metamodels/MOFEXT241.cmof
+- $(INSTALL_project) gnat/install/amf_mofext.gpr $(INSTALL_PROJECT_DIR)/amf_mofext.gpr
++ $(INSTALL_project) gnat/install/matreshka_amf_mofext.gpr $(INSTALL_PROJECT_DIR)/matreshka_amf_mofext.gpr
+ ifeq ($(OPERATING_SYSTEM), POSIX)
+ $(INSTALL) .libs/libmatreshka-amf-mofext$(RTL_VERSION).$(LIBEXT).$(VERSION) $(INSTALL_LIBRARY_DIR)/libmatreshka-amf-mofext$(RTL_VERSION).$(LIBEXT).$(VERSION)
+ cd $(INSTALL_LIBRARY_DIR) && ${LN_S} libmatreshka-amf-mofext$(RTL_VERSION).$(LIBEXT).$(VERSION) libmatreshka-amf-mofext$(RTL_VERSION).$(LIBEXT)
+@@ -431,7 +431,7 @@ endif
+ cat amf_mofext-src.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(-,root,root) %{_includedir}/matreshka/amf/mofext/{}" > .objs/amf_mofext-devel.files
+ cat amf_mofext-ali.lst | xargs -I{} basename {} | xargs -I{} echo "%attr(0444, root, root) %{_libdir}/matreshka/{}" >> .objs/amf_mofext-devel.files
+ echo "%attr(-,root,root) %{_datadir}/matreshka/amf/metamodels/MOFEXT241.cmof" >> .objs/amf_mofext-lib.files
+- echo "%attr(-,root,root) %{_gprdir}/amf_mofext.gpr" >> .objs/amf_mofext-devel.files
++ echo "%attr(-,root,root) %{_gprdir}/matreshka_amf_mofext.gpr" >> .objs/amf_mofext-devel.files
+ echo "%attr(-,root,root) %{_libdir}/libmatreshka-amf-mofext$(RTL_VERSION).$(LIBEXT)" >> .objs/amf_mofext-devel.files
+
+ cleanup:
diff --git a/matreshka.spec b/matreshka.spec
index 8a89246..fbcde65 100644
--- a/matreshka.spec
+++ b/matreshka.spec
@@ -1,7 +1,7 @@
%define _gprdir %_GNAT_project_dir
Name: matreshka
-Version: 0.3.0
-Release: 4%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
Summary: Set of Ada libraries to help to develop information systems
Group: System Environment/Libraries
License: BSD
@@ -9,7 +9,6 @@ URL: http://adaforge.qtada.com/cgi-bin/tracker.fcgi/matreshka
Source0: http://adaforge.qtada.com/cgi-bin/tracker.fcgi/matreshka/downloader/download/file/13/%{name}-%{version}.tar.gz
## fedora specific
Patch1: %{name}-%{version}_gprnames.patch
-Patch2: %{name}-%{version}_smp.patch
## fedora has stable release ABI. so we haven't to specify RTL
Patch4: %{name}-%{version}_gpr.patch
BuildRequires: gcc-gnat
@@ -276,11 +275,10 @@ Requires: fedora-gnat-project-common >= 2
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .names
cd gnat/install && for i in `ls *.gpr` ; do mv $i matreshka_$i ; done
cd -
-%patch4 -p1
+%patch4 -p1 -b .gprfix
%build
###export GPRBUILD_FLAGS="%{GPRbuild_optflags}"
@@ -363,6 +361,9 @@ chrpath --delete %{buildroot}%{_libdir}/lib*
%files amf-mofext-devel -f .objs/amf_mofext-devel.files
%changelog
+* Thu Apr 25 2013 Tom Callaway <spot at fedoraproject.org> - 0.4.0-1
+- update to 0.4.0
+
* Tue Feb 12 2013 Pavel Zhukov <landgraf at fedoraproject.org> - 0.3.0-4
- Revuild with new libgnat 4.8
diff --git a/sources b/sources
index 30ca9ed..cf3ab96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff956ce5f8ec599d33cdc8d178ac3c4f matreshka-0.3.0.tar.gz
+769e9390a8ded8b2ea9e917a82a2a7cc matreshka-0.4.0.tar.gz
More information about the scm-commits
mailing list