[matreshka/f17] Update to 0.2.0

Pavel Zhukov landgraf at fedoraproject.org
Sun Mar 25 07:48:16 UTC 2012


commit fa4d92ab7189c3180e4650477f77dfb03248b51b
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date:   Sun Mar 25 11:48:13 2012 +0400

    Update to 0.2.0

 .gitignore               |    1 +
 matreshka-gpr.patch      |  230 ++++++++++++++-------------------------------
 matreshka-gprbuild.patch |   25 -----
 matreshka-make.patch     |   34 +++++++
 matreshka-rtl.patch      |   45 +++++++++
 matreshka.spec           |  181 +++++++++++++++++++++++++++++--------
 matreshka_RTL.patch      |   45 ---------
 sources                  |    2 +-
 8 files changed, 297 insertions(+), 266 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e9ee854..5dde25f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /matreshka-0.1.1.tar.gz
+/matreshka-0.2.0.tar.gz
diff --git a/matreshka-gpr.patch b/matreshka-gpr.patch
index 78a419b..1b06aba 100644
--- a/matreshka-gpr.patch
+++ b/matreshka-gpr.patch
@@ -1,198 +1,112 @@
---- a/gnat/install/fastcgi.gpr	2011-08-11 09:09:16.970532984 +0400
-+++ b/gnat/install/fastcgi.gpr	2011-08-11 09:09:39.618532977 +0400
-@@ -42,7 +42,7 @@
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
+--- a/gnat/install/fastcgi.gpr	2012-03-24 22:46:49.941943510 +0400
++++ b/gnat/install/fastcgi.gpr	2012-03-24 22:47:59.085941476 +0400
+@@ -41,8 +41,9 @@
  ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
--with "league.gpr";
-+with "matreshka_league.gpr";
- 
- library project FastCGI is
- 
---- a/gnat/install/sql.gpr	2011-08-11 09:09:56.289532979 +0400
-+++ b/gnat/install/sql.gpr	2011-08-11 09:10:08.095532985 +0400
-@@ -42,7 +42,7 @@
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
- ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
--with "league.gpr";
-+with "matreshka_league.gpr";
- 
- library project SQL is
- 
---- a/gnat/install/sql_postgresql.gpr	2011-08-11 09:10:13.929532976 +0400
-+++ b/gnat/install/sql_postgresql.gpr	2011-08-11 09:10:24.463532978 +0400
-@@ -42,7 +42,7 @@
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
- ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
--with "league.gpr";
-+with "matreshka_league.gpr";
- 
- library project SQL_PostgreSQL is
- 
---- a/gnat/install/sql_sqlite3.gpr	2011-08-11 09:10:27.586532976 +0400
-+++ b/gnat/install/sql_sqlite3.gpr	2011-08-11 09:10:38.407532975 +0400
-@@ -42,7 +42,7 @@
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
+ --  $Revision: 2127 $ $Date: 2011-10-03 07:43:18 +0200 (Mon, 03 Oct 2011) $
  ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
++with "directories.gpr";
+ with "matreshka/matreshka_config.gpr";
 -with "league.gpr";
 +with "matreshka_league.gpr";
  
- library project SQL_SQLite3 is
- 
---- a/gnat/install/league.gpr	2011-08-17 11:19:33.080723133 +0400
-+++ b/gnat/install/league.gpr	2011-08-17 11:21:30.773723144 +0400
-@@ -42,6 +42,7 @@
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
- ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
-+with "directories.gpr"
- 
- library project League is
- 
-@@ -49,7 +50,7 @@
- 
-    for Library_Kind use "dynamic";
-    for Library_Name use Library_Name;
--   for Source_Dirs use ("../../include/matreshka/league");
-+   for Source_Dirs use (Directories.Includedir & "/matreshka/league");
-    for Library_Dir use Config.Library_Dir;
-    for Library_ALI_Dir use Config.Library_ALI_Dir;
-    for Externally_Built use "True";
---- a/gnat/install/fastcgi.gpr	2011-08-17 11:22:00.175723128 +0400
-+++ b/gnat/install/fastcgi.gpr	2011-08-17 11:22:36.901723120 +0400
-@@ -43,6 +43,8 @@
- ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
- with "matreshka_league.gpr";
-+with "directories";
-+
- 
  library project FastCGI is
  
-@@ -50,7 +52,7 @@
+@@ -50,7 +51,7 @@
  
     for Library_Kind use "dynamic";
     for Library_Name use Library_Name;
 -   for Source_Dirs use ("../../include/matreshka/fastcgi");
-+   for Source_Dirs use ( Directories.Includedir &  "/matreshka/fastcgi");
-    for Library_Dir use Config.Library_Dir;
-    for Library_ALI_Dir use Config.Library_ALI_Dir;
++   for Source_Dirs use (Directories.IncludeDir & "/matreshka/fastcgi");
+    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/sql.gpr	2011-08-17 11:22:45.624723116 +0400
-+++ b/gnat/install/sql.gpr	2011-08-17 11:23:08.949723114 +0400
-@@ -43,6 +43,8 @@
+--- a/gnat/install/sql.gpr	2012-03-24 22:48:06.679941228 +0400
++++ b/gnat/install/sql.gpr	2012-03-24 22:48:46.936939919 +0400
+@@ -42,7 +42,8 @@
+ --  $Revision: 2127 $ $Date: 2011-10-03 07:43:18 +0200 (Mon, 03 Oct 2011) $
  ------------------------------------------------------------------------------
- with "matreshka/config.gpr";
- with "matreshka_league.gpr";
-+with "directories";
-+
+ with "matreshka/matreshka_config.gpr";
+-with "league.gpr";
++with "directories.gpr";
++with "matreshka_league.gpr";
  
  library project SQL is
  
-@@ -50,7 +52,7 @@
+@@ -50,7 +51,7 @@
  
     for Library_Kind use "dynamic";
     for Library_Name use Library_Name;
 -   for Source_Dirs use ("../../include/matreshka/sql");
-+   for Source_Dirs use (Directories.Includedir & "/include/matreshka/sql");
-    for Library_Dir use Config.Library_Dir;
-    for Library_ALI_Dir use Config.Library_ALI_Dir;
++   for Source_Dirs use (Directories.Includedir & "/matreshka/sql");
+    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/sql_postgresql.gpr	2011-08-17 11:23:14.482723117 +0400
-+++ b/gnat/install/sql_postgresql.gpr	2011-08-17 11:23:36.382723113 +0400
-@@ -41,6 +41,7 @@
- ------------------------------------------------------------------------------
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
+--- a/gnat/install/sql_postgresql.gpr	2012-03-24 22:48:53.596939832 +0400
++++ b/gnat/install/sql_postgresql.gpr	2012-03-24 22:49:46.617938272 +0400
+@@ -42,7 +42,8 @@
+ --  $Revision: 2127 $ $Date: 2011-10-03 07:43:18 +0200 (Mon, 03 Oct 2011) $
  ------------------------------------------------------------------------------
-+with "directories";
- with "matreshka/config.gpr";
- with "matreshka_league.gpr";
+ with "matreshka/matreshka_config.gpr";
+-with "league.gpr";
++with "directories.gpr";
++with "matreshka_league.gpr";
+ 
+ library project SQL_PostgreSQL is
  
 @@ -50,7 +51,7 @@
  
     for Library_Kind use "dynamic";
     for Library_Name use Library_Name;
 -   for Source_Dirs use ("../../include/matreshka/sql/postgresql");
-+   for Source_Dirs use (Directories.Includedir &  "/include/matreshka/sql/postgresql");
-    for Library_Dir use Config.Library_Dir;
-    for Library_ALI_Dir use Config.Library_ALI_Dir;
++   for Source_Dirs use (Directories.Includedir "/matreshka/sql/postgresql");
+    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/sql_sqlite3.gpr	2011-08-17 11:23:42.031723112 +0400
-+++ b/gnat/install/sql_sqlite3.gpr	2011-08-17 11:24:03.005723078 +0400
-@@ -41,6 +41,7 @@
+--- a/gnat/install/sql_sqlite3.gpr	2012-03-24 22:49:52.585938077 +0400
++++ b/gnat/install/sql_sqlite3.gpr	2012-03-24 22:50:25.090937028 +0400
+@@ -1,4 +1,5 @@
  ------------------------------------------------------------------------------
- --  $Revision: 1770 $ $Date: 2011-06-02 02:31:26 +0400 (Thu, 02 Jun 2011) $
++--
+ --                                                                          --
+ --                            Matreshka Project                             --
+ --                                                                          --
+@@ -42,7 +43,9 @@
+ --  $Revision: 2127 $ $Date: 2011-10-03 07:43:18 +0200 (Mon, 03 Oct 2011) $
  ------------------------------------------------------------------------------
-+with "directories";
- with "matreshka/config.gpr";
- with "matreshka_league.gpr";
+ with "matreshka/matreshka_config.gpr";
+-with "league.gpr";
++with "directories.gpr";
++with "matreshka_league.gpr";
++
  
-@@ -50,7 +51,7 @@
+ library project SQL_SQLite3 is
+ 
+@@ -50,7 +53,7 @@
  
     for Library_Kind use "dynamic";
     for Library_Name use Library_Name;
 -   for Source_Dirs use ("../../include/matreshka/sql/sqlite3");
-+   for Source_Dirs use (Directories.Includedir & "/include/matreshka/sql/sqlite3");
-    for Library_Dir use Config.Library_Dir;
-    for Library_ALI_Dir use Config.Library_ALI_Dir;
++   for Source_Dirs use (Directories.Includedir & "/matreshka/sql/sqlite3");
+    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/config.gpr.in	2011-08-22 22:15:18.585003293 +0400
-+++ b/gnat/install/config.gpr.in	2011-08-22 22:16:45.248000708 +0400
-@@ -41,7 +41,7 @@
- ------------------------------------------------------------------------------
- --  $Revision: 1858 $ $Date: 2011-07-03 09:58:16 +0400 (Sun, 03 Jul 2011) $
+--- a/gnat/install/league.gpr	2012-03-24 22:50:40.620936647 +0400
++++ b/gnat/install/league.gpr	2012-03-24 22:51:10.860935761 +0400
+@@ -42,6 +42,8 @@
+ --  $Revision: 2132 $ $Date: 2011-10-09 20:40:27 +0200 (Sun, 09 Oct 2011) $
  ------------------------------------------------------------------------------
--
-+with "directories";
- abstract project Config is
+ with "matreshka/matreshka_config.gpr";
++with "directories.gpr";
++
  
-    Version := "0.1.1";
-## @@ -57,7 +57,7 @@
-##       "portable_64_le",
-##       "x86",
-##       "x86_64");
-## -   Architecture : Architectures := external ("ARCHITECTURE", "@ARCHITECTURE@");
-## +   Architecture : Architectures := external ("ARCHITECTURE", Directories.Hardware_Platform);
-##  
-##     type Operating_Systems is ("POSIX", "Windows");
-##     Operating_System : Operating_Systems
---- a/gnat/install/config.gpr.in	2011-08-27 11:19:21.489597636 +0400
-+++ b/gnat/install/config.gpr.in	2011-08-27 11:19:40.383598367 +0400
-@@ -58,6 +58,24 @@
-      "x86",
-      "x86_64");
-    Architecture : Architectures := external ("ARCHITECTURE", "@ARCHITECTURE@");
-+   case Directories.Hardware_Platform is
-+       when "i386" =>
-+           Architecture : Architectures := external ("ARCHITECTURE", "x86");
-+       when "x86_64" =>
-+           Architecture : Architectures := external ("ARCHITECTURE", "x86_64");
-+       when "arm" =>
-+           Architecture : Architectures := external ("ARCHITECTURE",
-+           "portable_32_le");
-+       when "alpha" | "ia64" =>
-+           Architecture : Architectures := external ("ARCHITECTURE",
-+           "portable_64_le");
-+       when "ppc" | "s390" | "sparc" =>
-+           Architecture : Architectures := external ("ARCHITECTURE",
-+           "portable_32_be");
-+       when "ppc64" | "s390x" | "sparc64" =>
-+           Architecture : Architectures := external ("ARCHITECTURE",
-+           "portable_64_be");
-+   end case;
+ library project League is
+ 
+@@ -49,7 +51,7 @@
  
-    type Operating_Systems is ("POSIX", "Windows");
-    Operating_System : Operating_Systems
---- a/gnat/install/config.gpr.in	2011-08-27 11:50:45.646542671 +0400
-+++ b/gnat/install/config.gpr.in	2011-08-27 11:50:52.492542400 +0400
-@@ -57,7 +57,6 @@
-      "portable_64_le",
-      "x86",
-      "x86_64");
--   Architecture : Architectures := external ("ARCHITECTURE", "@ARCHITECTURE@");
-    case Directories.Hardware_Platform is
-        when "i386" =>
-            Architecture : Architectures := external ("ARCHITECTURE", "x86");
+    for Library_Kind use "dynamic";
+    for Library_Name use Library_Name;
+-   for Source_Dirs use ("../../include/matreshka/league");
++   for Source_Dirs use ( Directories.Includedir & "/matreshka/league");
+    for Library_Dir use Matreshka_Config.Library_Dir;
+    for Library_ALI_Dir use Matreshka_Config.Library_ALI_Dir;
+    for Externally_Built use "True";
diff --git a/matreshka-make.patch b/matreshka-make.patch
new file mode 100644
index 0000000..311653d
--- /dev/null
+++ b/matreshka-make.patch
@@ -0,0 +1,34 @@
+--- a/Makefile.build	2012-03-25 00:25:29.181767429 +0400
++++ b/Makefile.build	2012-03-25 00:26:34.151765498 +0400
+@@ -22,24 +22,24 @@
+ league:
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_league.gpr
+ 
+-xml:
++xml: league
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_xml.gpr
+ 
+-fastcgi:
++fastcgi:league
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_fastcgi.gpr
+ 
+-sql:
++sql: league 
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_sql.gpr
+ 
+-sqlite3:
++sqlite3: league sql
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_sql_sqlite3.gpr
+ 
+-postgresql:
++postgresql:league sql
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_sql_postgresql.gpr
+ 
+-oci:
++oci: league sql 
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_sql_oracle.gpr
+ 
+-amf:
++amf: league xml 
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_amf.gpr
+ 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_amf_uml.gpr
diff --git a/matreshka-rtl.patch b/matreshka-rtl.patch
new file mode 100644
index 0000000..6d55100
--- /dev/null
+++ b/matreshka-rtl.patch
@@ -0,0 +1,45 @@
+--- a/Makefile.config.in	2012-03-25 00:42:20.002738078 +0400
++++ b/Makefile.config.in	2012-03-25 00:42:40.750736744 +0400
+@@ -1,6 +1,6 @@
+ 
+ VERSION = 0.2.0
+-RTL_VERSION = @RTL_VERSION_SUFFIX@
++RTL_VERSION ?=  ""
+ OPERATING_SYSTEM = @OPERATING_SYSTEM@
+ 
+ PREFIX = @PREFIX@
+--- a/gnat/install/matreshka_config.gpr.in	2012-03-25 00:43:21.183735539 +0400
++++ b/gnat/install/matreshka_config.gpr.in	2012-03-25 00:43:58.041734366 +0400
+@@ -67,8 +67,8 @@
+    --  Shared libraries version suffix, library and ALI directories.
+ 
+    RTL_Version_Suffix := "@RTL_VERSION_SUFFIX@";
+-   Library_Dir := "@LIBDIR@";
+-   Library_ALI_Dir := "@LIBDIR@/matreshka";
++   Library_Dir := Directories.Libdir;
++   Library_ALI_Dir := Directories.Libdir & "/matreshka";
+ 
+    case Operating_System is
+       when "POSIX" =>
+--- a/gnat/install/matreshka_config.gpr.in	2012-03-25 00:44:07.321734166 +0400
++++ b/gnat/install/matreshka_config.gpr.in	2012-03-25 00:44:23.369733712 +0400
+@@ -66,7 +66,7 @@
+ 
+    --  Shared libraries version suffix, library and ALI directories.
+ 
+-   RTL_Version_Suffix := "@RTL_VERSION_SUFFIX@";
++   RTL_Version_Suffix := "";
+    Library_Dir := Directories.Libdir;
+    Library_ALI_Dir := Directories.Libdir & "/matreshka";
+ 
+--- a/gnat/matreshka_config.gpr.in	2012-03-25 00:44:27.975733549 +0400
++++ b/gnat/matreshka_config.gpr.in	2012-03-25 00:44:43.066733084 +0400
+@@ -48,7 +48,7 @@
+ 
+    Version := "0.2.0";
+ 
+-   RTL_Version_Suffix := "@RTL_VERSION_SUFFIX@";
++   RTL_Version_Suffix := "";
+ 
+    type Architectures is
+     ("portable_32_be",
diff --git a/matreshka.spec b/matreshka.spec
index f010670..3ed324f 100644
--- a/matreshka.spec
+++ b/matreshka.spec
@@ -1,6 +1,6 @@
 Name:       matreshka
-Version:    0.1.1
-Release:    10%{?dist}
+Version:    0.2.0
+Release:    3%{?dist}
 Summary:    Set of Ada libraries to help to develop information systems
 Group:      System Environment/Libraries
 License:    BSD
@@ -8,9 +8,9 @@ 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}-gpr.patch
+Patch2:          %{name}-make.patch
 ## fedora has stable release ABI. so we haven't to specify RTL
-Patch3:          matreshka_RTL.patch
-Patch4:          matreshka-gprbuild.patch
+Patch3:          matreshka-rtl.patch
 BuildRequires:   gcc-gnat
 BuildRequires:   fedora-gnat-project-common  >= 3 
 BuildRequires:   chrpath
@@ -117,7 +117,7 @@ Requires:   fedora-gnat-project-common  >= 2
 %{summary}
 
 %package sql-postgresql
-Summary:    SQLite bindings for Ada
+Summary:    postgresql bindings for Ada
 License:    BSD
 Group:      System Environment/Libraries
 Requires:   %{name}%{?_isa}  = %{version}-%{release}
@@ -137,19 +137,95 @@ Requires:   fedora-gnat-project-common  >= 2
 %description sql-postgresql-devel
 %{summary}
 
+
+%package xml
+Summary:    Manipulate with XML streams and document
+License:    BSD
+Group:      System Environment/Libraries
+Requires:   %{name}%{?_isa}  = %{version}-%{release}
+
+%description xml
+XML processor  provides capability to manipulate 
+with XML streams and documents; including:
+
+  SAX reader to read XML streams and documents; 
+  it supports XML1.0 (Fifth Edition), 
+  XML1.1 (Second Edition), 
+  Namespaces in XML  and XML Base specifications;
+  
+  SAX writer to generate XML streams 
+  and documents from application;
+  
+  XML Catalogs resolver . 
+%package xml-devel
+Summary:    Devel package for Matreshka-xml
+License:    BSD
+Group:      Development/Libraries
+Requires:   %{name}-xml%{?_isa} = %{version}-%{release}
+Requires:   fedora-gnat-project-common  >= 2
+
+%description xml-devel
+%{summary}
+
+%package amf
+Summary:    Implementation of OMG's Meta Object Facility (MOF)
+License:    BSD
+Group:      System Environment/Libraries
+Requires:   %{name}%{?_isa}  = %{version}-%{release}
+Requires:   %{name}-xml%{?_isa}  = %{version}-%{release}
+
+%description amf
+Ada Modeling Framework provides implementation of OMG's Meta Object Facility (MOF) 
+written completely in Ada. Extension modules is provided to analyze/modify:
+    UML models
+        MOF Extensions models to support metamodeling 0.3
+        OCL models 0.3 
+
+%package amf-devel
+Summary:    Devel package for Matreshka-amf
+License:    BSD
+Group:      Development/Libraries
+Requires:   %{name}-amf%{?_isa} = %{version}-%{release}
+Requires:   fedora-gnat-project-common  >= 2
+
+%description amf-devel
+%{summary}
+
+%package amf-uml
+Summary:    Implementation of OMG's Meta Object Facility (MOF)
+License:    BSD
+Group:      System Environment/Libraries
+Requires:   %{name}-amf%{?_isa} = %{version}-%{release}
+
+%description amf-uml
+Ada Modeling Framework provides implementation of OMG's Meta Object Facility (MOF) 
+written completely in Ada. Extension modules is provided to analyze/modify:
+    UML models
+        MOF Extensions models to support metamodeling 0.3
+        OCL models 0.3 
+
+%package amf-uml-devel
+Summary:    Devel package for Matreshka-uml
+License:    BSD
+Group:      Development/Libraries
+Requires:   %{name}-uml%{?_isa} = %{version}-%{release}
+Requires:   fedora-gnat-project-common  >= 2
+
+%description amf-uml-devel
+%{summary}
+
 %prep
 %setup -q 
 %patch1 -p1
-%patch3 -p1
-## http://adaforge.qtada.com/matreshka/ticket/134
-%patch4 -p1 
+%patch2 -p1
+%patch3 -p1 
 
 %build
 ###export GPRBUILD_FLAGS="%{GPRbuild_optflags}"
 export GPRBUILD_FLAGS="%Gnatmake_optflags"
 make config 
 %configure
-make %{?_smp_mflags}
+make  %{?_smp_mflags}
 
 %check 
 ## find libs without RPATH, Fedora specific
@@ -161,7 +237,12 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_LIBRARY_DIR=%{buildroot}/%{_libdir} PREFIX=%{_prefix} INSTALL_PROJECT_DIR="%{buildroot}/%{_GNAT_project_dir}"
 ## Delete rpath
 chrpath --delete %{buildroot}%{_libdir}/lib*
+sed -i 's/league.gpr/matreshka_league.gpr/' .objs/league-devel.files
+sed -i 's/amf.gpr/matreshka_amf.gpr/' .objs/amf-devel.files
+sed -i 's/xml.gpr/matreshka_xml.gpr/' .objs/xml-devel.files
+sed -i 's/amf_uml.gpr/matreshka_amf_uml.gpr/' .objs/amf_uml-devel.files
 ## https://bugzilla.redhat.com/show_bug.cgi?id=675557#c11
+## http://forge.ada-ru.org/matreshka/ticket/166
 cd %{buildroot}%{_GNAT_project_dir} && for file in $(ls *.gpr); do mv $file matreshka_$file; done 
 
 %post     -p /sbin/ldconfig
@@ -181,39 +262,45 @@ cd %{buildroot}%{_GNAT_project_dir} && for file in $(ls *.gpr); do mv $file matr
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE
+%doc CONTRIBUTORS  LICENSE
 %{_libdir}/libleague.so.%{version}
 
-%files devel
+%files devel -f .objs/league-devel.files
 %defattr(-,root,root,-)
 %doc README
 %dir %{_libdir}/%{name}
 %dir %{_includedir}/%{name}
 %dir %{_GNAT_project_dir}/%{name}
-%{_includedir}/%{name}/league
-%{_libdir}/libleague.so
-%{_libdir}/%{name}/xml*
-%{_libdir}/%{name}/league*
-%{_libdir}/%{name}/%{name}-internals-strings*
-%{_libdir}/%{name}/%{name}-internals-text*
-%{_libdir}/%{name}/%{name}-internals-translator*
-%{_libdir}/%{name}/%{name}-internals-unicode*
-%{_libdir}/%{name}/%{name}-internals-uri_utilities.ali
-%{_libdir}/%{name}/%{name}-internals-utf16.ali
-%{_libdir}/%{name}/%{name}-internals-xml*
-%{_libdir}/%{name}/%{name}-internals.ali
-%{_libdir}/%{name}/%{name}.ali
-%{_libdir}/%{name}/%{name}-internals-regexps*
-%{_libdir}/%{name}/%{name}-internals-settings*
-%{_libdir}/%{name}/%{name}-internals-simd*
-%{_libdir}/%{name}/%{name}-internals-calendar*
-%{_libdir}/%{name}/%{name}-internals-atomics*
-%{_libdir}/%{name}/%{name}-internals-host_types.ali
-%{_libdir}/%{name}/%{name}-internals-locales.ali
-%{_libdir}/%{name}/%{name}-internals-stream_element_vectors.ali
-%{_libdir}/%{name}/%{name}-internals-string_vectors.ali
-%{_GNAT_project_dir}/matreshka_league.gpr
-%{_GNAT_project_dir}/%{name}/config.gpr
+## %{_includedir}/%{name}/league
+## %{_libdir}/libleague.so
+## %{_libdir}/%{name}/xml*
+## %{_libdir}/%{name}/league*
+## %{_libdir}/%{name}/%{name}-internals-strings*
+## %{_libdir}/%{name}/%{name}-internals-text*
+## %{_libdir}/%{name}/%{name}-internals-translator*
+## %{_libdir}/%{name}/%{name}-internals-unicode*
+## %{_libdir}/%{name}/%{name}-internals-uri_utilities.ali
+## %{_libdir}/%{name}/%{name}-internals-utf16.ali
+## %{_libdir}/%{name}/%{name}-internals-xml*
+## %{_libdir}/%{name}/%{name}-internals.ali
+## %{_libdir}/%{name}/%{name}.ali
+## %{_libdir}/%{name}/%{name}-internals-regexps*
+## %{_libdir}/%{name}/%{name}-internals-settings*
+## %{_libdir}/%{name}/%{name}-internals-simd*
+## %{_libdir}/%{name}/%{name}-internals-calendar*
+## ##%%{_libdir}/%{name}/%{name}-internals-atomics*
+## %{_libdir}/%{name}/%{name}-internals-host_types.ali
+## %{_libdir}/%{name}/%{name}-internals-locales.ali
+## %{_libdir}/%{name}/%{name}-internals-stream_element_vectors.ali
+## %{_libdir}/%{name}/%{name}-internals-string_vectors.ali
+## %{_GNAT_project_dir}/matreshka_league.gpr
+## %{_GNAT_project_dir}/%{name}/%{name}_config.gpr
+## %{_libdir}/%{name}/%{name}-atomics-counters__gcc.ali
+## %{_libdir}/%{name}/%{name}-atomics-generic_test_and_set__gcc__64.ali
+## %{_libdir}/%{name}/%{name}-atomics.ali
+## %{_libdir}/%{name}/%{name}-internals-code_point_sets.ali
+## %{_libdir}/%{name}/%{name}-internals-sax_locators.ali
+
 
 
 %files fastcgi
@@ -276,9 +363,29 @@ cd %{buildroot}%{_GNAT_project_dir} && for file in $(ls *.gpr); do mv $file matr
 %{_libdir}/%{name}/%{name}-internals-sql_drivers-postgresql*
 %{_GNAT_project_dir}/matreshka_sql_postgresql.gpr
 
+%files xml -f .objs/xml-lib.files
+%defattr(-,root,root,-)
+
+%files xml-devel -f .objs/xml-devel.files
+%defattr(-,root,root,-)
+
+%files amf -f .objs/amf-lib.files
+%defattr(-,root,root,-)
+
+%files amf-devel -f .objs/amf-devel.files
+%defattr(-,root,root,-)
+
+%files amf-uml -f .objs/amf_uml-lib.files
+%defattr(-,root,root,-)
+
+%files amf-uml-devel -f .objs/amf_uml-devel.files
+%defattr(-,root,root,-)
+
 %changelog
-* Thu Jan 12 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.1.1-10
-- GCC-4.7 rebuild 
+* Sun Mar 24 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 0.2.0-3
+- Update to 0.2.0
+- Fix filelist
+- Add files list
 
 * Wed Aug 31 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 0.1.1-9
 - fix BR, ExcludeArch 
diff --git a/sources b/sources
index 0bd36ee..12a692d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f6990c7698a3935dc3bcb65cad37ef4  matreshka-0.1.1.tar.gz
+c17623d2e921fd93cdd54c700fcb1ff7  matreshka-0.2.0.tar.gz


More information about the scm-commits mailing list