[matreshka] Update project names
Pavel Zhukov
landgraf at fedoraproject.org
Sun Sep 30 15:08:10 UTC 2012
commit 8c056a634de14bcad9533165a138d9e633e17e7b
Author: Pavel Zhukov <pavel at zhukoff.net>
Date: Sun Sep 30 19:07:19 2012 +0400
Update project names
matreshka-0.3.0_gpr.patch | 280 +++++++++++++++++++++++++++++++++++++++++++++
matreshka-rtl.patch | 45 -------
matreshka.spec | 9 +-
3 files changed, 287 insertions(+), 47 deletions(-)
---
diff --git a/matreshka-0.3.0_gpr.patch b/matreshka-0.3.0_gpr.patch
new file mode 100644
index 0000000..5b08322
--- /dev/null
+++ b/matreshka-0.3.0_gpr.patch
@@ -0,0 +1,280 @@
+--- a/gnat/install/matreshka_amf.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_amf.gpr 2012-09-30 18:23:07.595431999 +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 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF;
++end matreshka_amf;
+--- a/gnat/install/matreshka_amf_mofext.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_amf_mofext.gpr 2012-09-30 18:23:07.596431999 +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 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_MOFEXT;
++end matreshka_amf_mofext;
+--- a/gnat/install/matreshka_amf_ocl.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_amf_ocl.gpr 2012-09-30 18:23:07.593431999 +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 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_OCL;
++end matreshka_amf_ocl;
+--- a/gnat/install/matreshka_amf_uml.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_amf_uml.gpr 2012-09-30 18:23:07.593431999 +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 "amf.gpr";
+
+-library project AMF_UML is
++library project matreshka_amf_uml is
+
+ Library_Name := "matreshka-amf-uml" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -56,4 +57,4 @@
+ 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/matreshka_amf_utp.gpr 2012-04-07 01:46:48.000000000 +0400
++++ b/gnat/install/matreshka_amf_utp.gpr 2012-09-30 18:23:07.594431999 +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 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end AMF_UTP;
++end matreshka_amf_utp;
+--- a/gnat/install/matreshka_fastcgi.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_fastcgi.gpr 2012-09-30 18:23:07.593431999 +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 @@
+
+ end Naming;
+
+-end FastCGI;
++end matreshka_fastcgi;
+--- a/gnat/install/matreshka_league.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_league.gpr 2012-09-30 18:23:07.594431999 +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 @@
+
+ end Naming;
+
+-end League;
++end matreshka_league;
+--- a/gnat/install/matreshka_sql_firebird.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_sql_firebird.gpr 2012-09-30 18:23:07.595431999 +0400
+@@ -41,10 +41,11 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: $ $Date: $
+ ------------------------------------------------------------------------------
++with "directories";
+ with "matreshka/matreshka_config.gpr";
+ with "league.gpr";
+
+-library project SQL_Firebird is
++library project matreshka_sql_firebird is
+
+ Library_Name := "matreshka-sql-firebird" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,4 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end SQL_Firebird;
++end matreshka_sql_firebird;
+--- a/gnat/install/matreshka_sql.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_sql.gpr 2012-09-30 18:23:07.595431999 +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 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end SQL;
++end matreshka_sql;
+--- a/gnat/install/matreshka_sql_oracle.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_sql_oracle.gpr 2012-09-30 18:23:07.593431999 +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_Oracle is
++library project matreshka_sql_oracle is
+
+ Library_Name := "matreshka-sql-oci" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,4 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end SQL_Oracle;
++end matreshka_sql_oracle;
+--- a/gnat/install/matreshka_sql_postgresql.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_sql_postgresql.gpr 2012-09-30 18:23:07.595431999 +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_PostgreSQL is
++library project matreshka_sql_postgresql is
+
+ Library_Name := "matreshka-sql-postgresql" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,4 @@
+ for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+ for Externally_Built use "True";
+
+-end SQL_PostgreSQL;
++end matreshka_sql_postgresql;
+--- a/gnat/install/matreshka_sql_sqlite3.gpr 2012-04-03 23:34:17.000000000 +0400
++++ b/gnat/install/matreshka_sql_sqlite3.gpr 2012-09-30 18:23:07.596431999 +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_SQLite3 is
++library project matreshka_sql_sqlite3 is
+
+ Library_Name := "matreshka-sql-sqlite3" & Matreshka_Config.RTL_Version_Suffix;
+
+@@ -55,4 +56,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/matreshka_xml.gpr 2011-12-03 17:58:21.000000000 +0400
++++ b/gnat/install/matreshka_xml.gpr 2012-09-30 18:23:07.594431999 +0400
+@@ -41,10 +41,11 @@
+ ------------------------------------------------------------------------------
+ -- $Revision: 2327 $ $Date: 2011-12-03 17:58:21 +0400 (Sat, 03 Dec 2011) $
+ ------------------------------------------------------------------------------
++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 @@
+ 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 b6abeb3..2c799d9 100644
--- a/matreshka.spec
+++ b/matreshka.spec
@@ -1,7 +1,7 @@
%define _gprdir %_GNAT_project_dir
Name: matreshka
Version: 0.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Set of Ada libraries to help to develop information systems
Group: System Environment/Libraries
License: BSD
@@ -11,7 +11,7 @@ Source0: http://adaforge.qtada.com/cgi-bin/tracker.fcgi/matreshka/downloader/
Patch1: %{name}-%{version}_gprnames.patch
Patch2: %{name}-%{version}_smp.patch
## fedora has stable release ABI. so we haven't to specify RTL
-Patch3: matreshka-rtl.patch
+Patch4: %{name}-%{version}_gpr.patch
BuildRequires: gcc-gnat
BuildRequires: fedora-gnat-project-common >= 3
BuildRequires: chrpath
@@ -279,6 +279,8 @@ Requires: fedora-gnat-project-common >= 2
%patch1 -p1
%patch2 -p1
cd gnat/install && for i in `ls *.gpr` ; do mv $i matreshka_$i ; done
+cd -
+%patch4 -p1
%build
###export GPRBUILD_FLAGS="%{GPRbuild_optflags}"
@@ -361,6 +363,9 @@ chrpath --delete %{buildroot}%{_libdir}/lib*
%files amf-mofext-devel -f .objs/amf_mofext-devel.files
%changelog
+* Sun Sep 30 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.3.0-2
+- Add gpr patch
+
* Mon Sep 24 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.3.0-1
- Release 0.3.0
More information about the scm-commits
mailing list