landgraf pushed to matreshka (master). "New release (0.7.0)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 26 20:40:46 UTC 2015
From 75cb9aef99a6db67ee8b36bcc91292c18a0c1ec8 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Tue, 26 May 2015 22:40:31 +0200
Subject: New release (0.7.0)
diff --git a/.gitignore b/.gitignore
index 60d2c90..c5402bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/matreshka-0.5.0.tar.gz
/matreshka-0.5.1.tar.gz
/matreshka-0.6.0.tar.gz
+/matreshka-0.7.0.tar.gz
diff --git a/matreshka-0.6.0-GCC5.patch b/matreshka-0.6.0-GCC5.patch
deleted file mode 100644
index ca5dea1..0000000
--- a/matreshka-0.6.0-GCC5.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- source/league/league-environment_variables.adb 2011-02-26 13:11:48.788640000 +0100
-+++ source/league/league-environment_variables.adb 2015-05-02 17:44:59.589254146 +0200
-@@ -61,8 +61,7 @@
- use type Universal_String_Maps.Map;
-
- begin
-- return
-- Universal_String_Maps.Map (Left) = Universal_String_Maps.Map (Right);
-+ return Left.Data = Right.Data;
- end "=";
-
- -----------
-@@ -71,7 +70,7 @@
-
- procedure Clear (Self : in out Environment_Variable_Set'Class) is
- begin
-- Universal_String_Maps.Map (Self).Clear;
-+ Self.Data.Clear;
- end Clear;
-
- --------------
-@@ -83,7 +82,7 @@
- Name : League.Strings.Universal_String) return Boolean
- is
- Key : constant Key_Type := To_Key (Name);
-- Position : constant Universal_String_Maps.Cursor := Self.Find (Key);
-+ Position : constant Universal_String_Maps.Cursor := Self.Data.Find (Key);
-
- begin
- return Universal_String_Maps.Has_Element (Position);
-@@ -108,14 +107,14 @@
- Value : League.Strings.Universal_String)
- is
- Key : constant Key_Type := To_Key (Name);
-- Position : constant Universal_String_Maps.Cursor := Self.Find (Key);
-+ Position : constant Universal_String_Maps.Cursor := Self.Data.Find (Key);
-
- begin
- if Universal_String_Maps.Has_Element (Position) then
-- Self.Replace_Element (Position, Value);
-+ Self.Data.Replace_Element (Position, Value);
-
- else
-- Self.Insert (Key, Value);
-+ Self.Data.Insert (Key, Value);
- end if;
- end Insert;
-
-@@ -128,11 +127,11 @@
- Name : League.Strings.Universal_String)
- is
- Key : constant Key_Type := To_Key (Name);
-- Position : Universal_String_Maps.Cursor := Self.Find (Key);
-+ Position : Universal_String_Maps.Cursor := Self.Data.Find (Key);
-
- begin
- if Universal_String_Maps.Has_Element (Position) then
-- Self.Delete (Position);
-+ Self.Data.Delete (Position);
- end if;
- end Remove;
-
-@@ -155,7 +154,7 @@
- return League.Strings.Universal_String
- is
- Key : constant Key_Type := To_Key (Name);
-- Position : constant Universal_String_Maps.Cursor := Self.Find (Key);
-+ Position : constant Universal_String_Maps.Cursor := Self.Data.Find (Key);
-
- begin
- if Universal_String_Maps.Has_Element (Position) then
---- source/league/league-environment_variables.ads 2012-08-13 09:41:05.105439000 +0200
-+++ source/league/league-environment_variables.ads 2015-05-02 17:44:59.589254146 +0200
-@@ -93,7 +93,8 @@
- "=",
- League.Strings."=");
-
-- type Environment_Variable_Set is
-- new Universal_String_Maps.Map with null record;
-+ type Environment_Variable_Set is tagged record
-+ Data : Universal_String_Maps.Map;
-+ end record;
-
- end League.Environment_Variables;
---- source/xml/sax/xml/xml-sax-simple_readers.ads 2012-10-08 17:25:42.487161000 +0200
-+++ source/xml/sax/xml/xml-sax-simple_readers.ads 2015-05-02 16:45:24.480791034 +0200
-@@ -303,7 +303,7 @@
- type Simple_Shared_Locator is tagged;
- type Simple_Shared_Locator_Access is access all Simple_Shared_Locator'Class;
-
-- type SAX_Simple_Reader is new Ada.Finalization.Limited_Controlled
-+ type SAX_Simple_Reader is limited new Ada.Finalization.Limited_Controlled
- and XML.SAX.Readers.SAX_Reader with
- record
- -- Handlers
---- source/xml/sax/xml-sax-input_sources-streams-sockets.ads 2011-07-22 22:16:17.999942000 +0200
-+++ source/xml/sax/xml-sax-input_sources-streams-sockets.ads 2015-05-02 16:54:10.442710474 +0200
-@@ -63,7 +63,7 @@
-
- private
-
-- type Socket_Input_Source is new Stream_Input_Source with record
-+ type Socket_Input_Source is limited new Stream_Input_Source with record
- Socket : GNAT.Sockets.Socket_Type;
- end record;
-
---- testsuite/xml/sax_events_writers.ads 2013-10-28 12:46:59.843622000 +0100
-+++ testsuite/xml/sax_events_writers.ads 2015-05-02 18:26:33.838316036 +0200
-@@ -190,7 +190,7 @@
- private
-
- type SAX_Events_Writer is
-- new Ada.Finalization.Limited_Controlled
-+ limited new Ada.Finalization.Limited_Controlled
- and XML.SAX.Content_Handlers.SAX_Content_Handler
- and XML.SAX.DTD_Handlers.SAX_DTD_Handler
- and XML.SAX.Entity_Resolvers.SAX_Entity_Resolver
diff --git a/matreshka.spec b/matreshka.spec
index 975b21e..1f14fe0 100644
--- a/matreshka.spec
+++ b/matreshka.spec
@@ -1,15 +1,13 @@
%undefine _hardened_build
%define _gprdir %_GNAT_project_dir
Name: matreshka
-Version: 0.6.0
-Release: 10%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Set of Ada libraries to help to develop information systems
Group: System Environment/Libraries
License: BSD
URL: http://forge.ada-ru.org/matreshka
Source0: http://forge.ada-ru.org/matreshka/downloads/%{name}-%{version}.tar.gz
-## http://forge.ada-ru.org/matreshka/ticket/398
-Patch0: %{name}-%{version}-GCC5.patch
BuildRequires: gcc-gnat
BuildRequires: fedora-gnat-project-common >= 3
BuildRequires: chrpath
@@ -331,9 +329,69 @@ Requires: fedora-gnat-project-common >= 2
%description amf-mofext-devel
%{summary}
+%package spikedog-api-lib
+Summary: Web-application server to execute Ada applications (api library)
+License: BSD
+Group: Development/Libraries
+Requires: %{name}{?_isa} = %{version}-%{release}
+Requires: %{name}-servlet-api{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+
+%description spikedog-api-lib
+%{summary}
+
+%package spikedog-api-devel
+Summary: Devel package for spikedog-api-lib
+License: BSD
+Group: Development/Libraries
+Requires: %{name}-spikedog-api-lib{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+
+%description spikedog-api-devel
+%{summary}
+
+%package spikedog-core-lib
+Summary: Web-application server to execute Ada applications (core library)
+License: BSD
+Group: Development/Libraries
+Requires: %{name}{?_isa} = %{version}-%{release}
+Requires: %{name}-servlet-api{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+
+%description spikedog-core-lib
+%{summary}
+
+%package spikedog-core-devel
+Summary: Devel package for spikedog-core-lib
+License: BSD
+Group: Development/Libraries
+Requires: %{name}-spikedog-core-lib{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+%description spikedog-core-devel
+%{summary}
+
+%package servlet-lib
+Summary: Server-independent implementation of Servlet API
+License: BSD
+Group: Development/Libraries
+Requires: %{name}{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+
+%description servlet-lib
+%{summary}
+
+%package servlet-devel
+Summary: Devel package for servlet-lib
+License: BSD
+Group: Development/Libraries
+Requires: %{name}-servlet-lib{?_isa} = %{version}-%{release}
+Requires: fedora-gnat-project-common >= 2
+
+%description servlet-devel
+%{summary}
+
%prep
%setup -q
-%patch0 -p0
%build
make config %{?_smp_mflags} GPRBUILD_FLAGS="%Gnatmake_optflags"
@@ -372,6 +430,7 @@ chrpath --delete %{buildroot}%{_libdir}/lib*
%files -f .objs/league-lib.files
%doc CONTRIBUTORS LICENSE
+%{_bindir}/uaflex
%files devel -f .objs/league-devel.files
%doc README
@@ -429,6 +488,18 @@ chrpath --delete %{buildroot}%{_libdir}/lib*
%files amf-mofext-devel -f .objs/amf_mofext-devel.files
+%files spikedog-api-devel -f .objs/spikedog-api-devel.files
+
+%files spikedog-api-lib -f .objs/spikedog-api-lib.files
+
+%files spikedog-core-devel -f .objs/spikedog-core-devel.files
+
+%files spikedog-core-lib -f .objs/spikedog-core-lib.files
+
+%files servlet-devel -f .objs/servlet-devel.files
+
+%files servlet-lib -f .objs/servlet-lib.files
+
%changelog
* Sat May 02 2015 Björn Persson <bjorn at rombobjörn.se> - 0.6.0-10
- Patched to build with GCC 5.
diff --git a/sources b/sources
index 44641bd..f8dd0bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a28e2dc7c581a78ec67ce51d86dc70b matreshka-0.6.0.tar.gz
+b91c79d5a845107dd486b9f47c5c061b matreshka-0.7.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/matreshka.git/commit/?h=master&id=75cb9aef99a6db67ee8b36bcc91292c18a0c1ec8
More information about the scm-commits
mailing list