[gnatcoll/f17] Fixed a lot of issues. Tested SQL and ORM
Pavel Zhukov
landgraf at fedoraproject.org
Tue Jul 24 17:51:25 UTC 2012
commit 017a8bf6715a585b7b9d900b5a6a35f1dbd528a2
Author: Pavel Zhukov <pavel at zhukoff.net>
Date: Tue Jul 24 21:51:14 2012 +0400
Fixed a lot of issues. Tested SQL and ORM
gnatcoll-2012-directories.patch | 24 ++++++++++++------------
gnatcoll-2012-optflags.patch | 13 +++++++++++++
gnatcoll.spec | 8 ++++++--
3 files changed, 31 insertions(+), 14 deletions(-)
---
diff --git a/gnatcoll-2012-directories.patch b/gnatcoll-2012-directories.patch
index 306f5b0..015e7a1 100644
--- a/gnatcoll-2012-directories.patch
+++ b/gnatcoll-2012-directories.patch
@@ -1,6 +1,6 @@
--- a/distrib/gnatcoll_gmp.gpr.in 2012-07-17 07:41:38.962001153 +0400
+++ b/distrib/gnatcoll_gmp.gpr.in 2012-07-17 07:42:56.793003663 +0400
-@@ -1,12 +1,12 @@
+@@ -1,12 +1,13 @@
+with "directories";
with "gnatcoll";
project GnatColl_Gmp is
@@ -9,7 +9,7 @@
+ for Source_Dirs use (Directories.Includedir & "/gnatcoll");
for Externally_Built use "true";
-
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use "../gnatcoll/" & Project'Library_Kind;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
@@ -27,14 +27,14 @@
project GnatColl is
Version := "@PACKAGE_VERSION@";
-@@ -21,11 +22,13 @@
+@@ -21,11 +22,14 @@
Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
+
for Library_Name use "gnatcoll";
- for Source_Dirs use ("../../include/gnatcoll");
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_Dirs use ("../../include/gnatcoll");
+
for Library_Kind use GnatColl_Kind;
@@ -55,12 +55,12 @@
with "gnat_util";
project GnatColl is
-@@ -24,10 +24,10 @@
+@@ -24,10 +24,11 @@
Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
for Library_Name use "gnatcoll";
- for Source_Dirs use ("../../include/gnatcoll");
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_Dirs use (Directories.Includedir & "/gnatcoll");
+
for Library_Kind use GnatColl_Kind;
@@ -71,7 +71,7 @@
--- a/distrib/gnatcoll_gtk.gpr 2012-07-17 07:44:58.857997846 +0400
+++ b/distrib/gnatcoll_gtk.gpr 2012-07-17 07:45:47.376003252 +0400
-@@ -1,13 +1,14 @@
+@@ -1,13 +1,15 @@
with "gnatcoll";
+with "directories";
+
@@ -82,7 +82,7 @@
+ for Source_Dirs use (Directories.Includedir & "/gnatcoll");
for Externally_Built use "true";
-
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
@@ -92,7 +92,7 @@
--- a/distrib/gnatcoll_postgres.gpr 2012-07-17 07:45:58.996991150 +0400
+++ b/distrib/gnatcoll_postgres.gpr 2012-07-17 07:46:34.337998228 +0400
-@@ -1,12 +1,13 @@
+@@ -1,12 +1,14 @@
with "gnatcoll";
+with "directories";
+
@@ -102,7 +102,7 @@
+ for Source_Dirs use (Directories.Includedir & "/gnatcoll");
for Externally_Built use "true";
-
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
@@ -112,7 +112,7 @@
--- a/distrib/gnatcoll_sqlite.gpr 2012-07-17 07:46:42.902006095 +0400
+++ b/distrib/gnatcoll_sqlite.gpr 2012-07-17 07:47:11.444018665 +0400
-@@ -1,12 +1,14 @@
+@@ -1,12 +1,15 @@
with "gnatcoll";
+with "directories";
project GnatColl_Sqlite is
@@ -122,7 +122,7 @@
+
for Externally_Built use "true";
-- for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
+ for Source_List_File use "gnatcoll/" & Project'Library_Name & ".lgpr";
for Library_Kind use GnatColl.GnatColl_Kind;
- for Library_Dir use GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
diff --git a/gnatcoll-2012-optflags.patch b/gnatcoll-2012-optflags.patch
index bcef36b..c3d5a69 100644
--- a/gnatcoll-2012-optflags.patch
+++ b/gnatcoll-2012-optflags.patch
@@ -35,3 +35,16 @@
installbin: force
$(CP) obj/gnatcoll_db2ada${EXE} $(bindir)
+--- a/Makefile 2012-07-17 22:15:12.991015492 +0400
++++ b/Makefile 2012-07-17 22:15:58.836995865 +0400
+@@ -3,8 +3,8 @@
+ include Makefile.conf
+
+ ifeq (${BUILDS_SHARED},yes)
+-all: generate_sources static relocatable tools_relocatable
+-install: install_relocatable install_static install_docs
++all: generate_sources relocatable tools_relocatable
++install: install_relocatable install_docs
+ else
+ all: generate_sources static tools_static
+ install: install_static install_docs
diff --git a/gnatcoll.spec b/gnatcoll.spec
index 08ef9e3..611177e 100644
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@ -1,6 +1,6 @@
Name: gnatcoll
Version: 2012
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Suite of reusable software components and utilities
Group: System Environment/Libraries
License: GPLv2+
@@ -59,7 +59,7 @@ rm -rf %{buildroot}/%{_datadir}/gps
%ifarch x86_64
rm -rf %{buildroot}/%{_libdir}/gnat
%endif
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/*.so.1.?w
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/*.so.*
chrpath --delete %{buildroot}/%{_bindir}/*
rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyc
rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
@@ -94,6 +94,10 @@ rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
%changelog
+* Tue Jul 24 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-5
+- Delete rpath from libraries
+- Add lgpr files to project
+
* Tue Jul 17 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-3
- Update to 2012
- Fix library type in gpr
More information about the scm-commits
mailing list