[gnatcoll] Update to gnatcoll-2012
Pavel Zhukov
landgraf at fedoraproject.org
Tue Jul 17 06:56:41 UTC 2012
commit 80f1086c91b1a94e05917a804a855669db6fe9da
Author: Pavel Zhukov <pavel at zhukoff.net>
Date: Tue Jul 17 10:56:31 2012 +0400
Update to gnatcoll-2012
.gitignore | 1 +
...tories.patch => gnatcoll-2012-directories.patch | 108 +++++++------
gnatcoll-2012-optflags.patch | 37 +++++
gnatcoll-destdir.patch | 167 --------------------
gnatcoll-optflags.patch | 33 ----
gnatcoll.spec | 36 +++--
sources | 2 +-
7 files changed, 119 insertions(+), 265 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b92b07..0912e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gnatcoll-gpl-2011-src.tgz
+/gnatcoll-gpl-2012-src.tgz
diff --git a/gnatcoll-directories.patch b/gnatcoll-2012-directories.patch
similarity index 63%
rename from gnatcoll-directories.patch
rename to gnatcoll-2012-directories.patch
index d867b52..306f5b0 100644
--- a/gnatcoll-directories.patch
+++ b/gnatcoll-2012-directories.patch
@@ -1,138 +1,152 @@
---- a/distrib/gnatcoll_gmp.gpr.in 2011-08-17 17:11:54.633720247 +0400
-+++ b/distrib/gnatcoll_gmp.gpr.in 2011-08-17 17:13:31.775720233 +0400
-@@ -1,12 +1,13 @@
- with "gnatcoll";
+--- 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 @@
+with "directories";
+ with "gnatcoll";
project GnatColl_Gmp is
for Library_Name use "gnatcoll_gmp";
- for Source_Dirs use ("../../include/gnatcoll");
+ 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;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
---- a/distrib/gnatcoll.gpr__copy.in 2011-08-17 17:13:53.326720222 +0400
-+++ b/distrib/gnatcoll.gpr__copy.in 2011-08-17 17:14:10.137720226 +0400
-@@ -5,7 +5,7 @@
+--- a/distrib/gnatcoll.gpr__copy.in 2012-07-17 07:43:07.134020551 +0400
++++ b/distrib/gnatcoll.gpr__copy.in 2012-07-17 07:43:55.340000978 +0400
+@@ -5,6 +5,7 @@
-- variable LIBRARY_TYPE.
-- The default depends on how gnatcoll was configured and compiled (although
-- in general it will be static since this works better in most cases)
--
-+with "directories":
++with "directories";
+
project GnatColl is
Version := "@PACKAGE_VERSION@";
+@@ -21,11 +22,13 @@
-@@ -19,10 +19,10 @@
- type Yes_No is ("yes", "no");
+ Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
++
for Library_Name use "gnatcoll";
- for Source_Dirs use ("../../include/gnatcoll");
-+ for Source_Dirs use (Directories.Includedir & "/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;
-- for Library_Dir use "../gnatcoll/" & Project'Library_Kind;
+- for Library_Dir use Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Version;
---- a/distrib/gnatcoll.gpr__gnat_util.in 2011-08-17 17:14:21.560720224 +0400
-+++ b/distrib/gnatcoll.gpr__gnat_util.in 2011-08-17 17:14:42.967720222 +0400
-@@ -7,6 +7,7 @@
+--- a/distrib/gnatcoll.gpr__gnat_util.in 2012-07-17 07:44:01.952004575 +0400
++++ b/distrib/gnatcoll.gpr__gnat_util.in 2012-07-17 07:44:46.238000418 +0400
+@@ -5,7 +5,7 @@
+ -- variable LIBRARY_TYPE.
+ -- The default depends on how gnatcoll was configured and compiled (although
-- in general it will be static since this works better in most cases)
-
- with "gnat_util";
+-
+with "directories";
+ with "gnat_util";
project GnatColl is
- Version := "@PACKAGE_VERSION@";
-@@ -21,10 +22,10 @@
- type Yes_No is ("yes", "no");
+@@ -24,10 +24,10 @@
+ Libdir := "../../@LIB@/gnatcoll/" & Gnatcoll_Kind;
for Library_Name use "gnatcoll";
- for Source_Dirs use ("../../include/gnatcoll");
-+ for Source_Dirs use (Directories.Includedir & "/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;
-- for Library_Dir use "../gnatcoll/" & Project'Library_Kind;
+- for Library_Dir use Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
for Library_Version use
"lib" & Project'Library_Name & ".so." & Version;
---- a/distrib/gnatcoll_gtk.gpr 2011-08-17 17:14:54.810720215 +0400
-+++ b/distrib/gnatcoll_gtk.gpr 2011-08-17 17:15:08.558720225 +0400
+--- 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 @@
with "gnatcoll";
- with "gtkada";
+with "directories";
++
+ with "gtkada";
project GnatColl_Gtk is
for Library_Name use "gnatcoll_gtk";
- for Source_Dirs use ("../../include/gnatcoll");
+ 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 GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
---- a/distrib/gnatcoll_postgres.gpr 2011-08-17 17:16:27.123720206 +0400
-+++ b/distrib/gnatcoll_postgres.gpr 2011-08-17 17:17:17.479720205 +0400
+--- 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 @@
with "gnatcoll";
+with "directories";
++
project GnatColl_Postgres is
for Library_Name use "gnatcoll_postgres";
- for Source_Dirs use ("../../include/gnatcoll");
+ 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 GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
---- a/distrib/gnatcoll_sqlite.gpr 2011-08-17 17:17:35.825720196 +0400
-+++ b/distrib/gnatcoll_sqlite.gpr 2011-08-17 17:18:02.783720190 +0400
-@@ -1,12 +1,13 @@
+--- 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 @@
with "gnatcoll";
+with "directories";
project GnatColl_Sqlite is
for Library_Name use "gnatcoll_sqlite";
- for Source_Dirs use ("../../include/gnatcoll");
+ 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 GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
---- a/distrib/gnatcoll_python.gpr.in 2011-08-17 17:18:54.009720185 +0400
-+++ b/distrib/gnatcoll_python.gpr.in 2011-08-17 17:19:11.863720183 +0400
-@@ -1,12 +1,13 @@
+--- a/distrib/gnatcoll_python.gpr.in 2012-07-17 07:47:15.904001339 +0400
++++ b/distrib/gnatcoll_python.gpr.in 2012-07-17 07:47:47.869996247 +0400
+@@ -1,12 +1,15 @@
with "gnatcoll";
+with "directories";
project GnatColl_Python is
for Library_Name use "gnatcoll_python";
- for Source_Dirs use ("../../include/gnatcoll");
+ for Source_Dirs use (Directories.Includedir & "/gnatcoll");
++
for Externally_Built use "true";
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 GnatColl.Libdir;
+ for Library_Dir use Directories.Libdir & "/gnatcoll/" & Project'Library_Kind;
++
for Library_Version use
"lib" & Project'Library_Name & ".so." & Gnatcoll.Version;
diff --git a/gnatcoll-2012-optflags.patch b/gnatcoll-2012-optflags.patch
new file mode 100644
index 0000000..bcef36b
--- /dev/null
+++ b/gnatcoll-2012-optflags.patch
@@ -0,0 +1,37 @@
+--- a/Makefile.conf.in 2012-07-17 10:00:48.546971357 +0400
++++ b/Makefile.conf.in 2012-07-17 10:01:23.333993087 +0400
+@@ -98,7 +98,7 @@
+ .PHONY: buildall libinstall
+ buildall:
+ @echo Building project ${PROJECT}
+- ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p
++ ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p ${GNAT_OPTFLAGS}
+
+ libinstall: installprint installsources installobj installlinks
+
+--- a/Makefile 2012-07-17 10:01:30.193995883 +0400
++++ b/Makefile 2012-07-17 10:01:57.310002000 +0400
+@@ -23,7 +23,7 @@
+ ## LIBRARY_TYPE variable
+
+ build_library_type:
+- ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p
++ ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p ${GNAT_OPTFLAGS}
+ ifeq (${WITH_GTK},yes)
+ ${MAKE} -C src -f Makefile.gtk buildall
+ endif
+--- a/src/Makefile.tools 2012-07-17 10:02:38.017973823 +0400
++++ b/src/Makefile.tools 2012-07-17 10:03:34.895979617 +0400
+@@ -16,10 +16,10 @@
+ endif
+
+ gnatinspect: force
+- ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
++ ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs ${GNAT_OPTFLAGS} $(POSTGRES_PATH)
+
+ gnatcoll_db2ada: force
+- ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
++ ${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P$(PROJECT) $@ -p -largs ${GNAT_OPTFLAGS} $(POSTGRES_PATH)
+
+ installbin: force
+ $(CP) obj/gnatcoll_db2ada${EXE} $(bindir)
diff --git a/gnatcoll.spec b/gnatcoll.spec
index d819e00..27d5e79 100644
--- a/gnatcoll.spec
+++ b/gnatcoll.spec
@@ -1,16 +1,14 @@
Name: gnatcoll
-Version: 2011
-Release: 9%{?dist}
+Version: 2012
+Release: 2%{?dist}
Summary: Suite of reusable software components and utilities
-
Group: System Environment/Libraries
License: GPLv2+
URL: http://libre.adacore.com
## Direct link not available
Source0: %{name}-gpl-%{version}-src.tgz
-Patch0: %{name}-destdir.patch
-Patch1: %{name}-directories.patch
-Patch2: %{name}-optflags.patch
+Patch1: %{name}-%{version}-directories.patch
+Patch2: %{name}-%{version}-optflags.patch
BuildRequires: fedora-gnat-project-common >= 2
BuildRequires: python-devel gmp-devel GtkAda-devel
BuildRequires: pygtk2-devel postgresql-devel chrpath
@@ -37,12 +35,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{name}-gpl-%{version}-src
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
-%configure
+%configure --enable-shared
%if 0%{?fedora} >= 16
export GNAT_OPTFLAGS="%GPRbuild_optflags"
%else
@@ -60,8 +57,10 @@ rm -rf %{buildroot}/%{_datadir}/gps
%ifarch x86_64
rm -rf %{buildroot}/%{_libdir}/gnat
%endif
-chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/*.so.1.4w
+chrpath --delete %{buildroot}/%{_libdir}/%{name}/relocatable/*.so.1.?w
chrpath --delete %{buildroot}/%{_bindir}/*
+rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyc
+rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo
%post -p /sbin/ldconfig
@@ -70,16 +69,18 @@ chrpath --delete %{buildroot}/%{_bindir}/*
%files
%defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING3 COPYING.RUNTIME
%{_bindir}/*
+%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/relocatable
-%{_libdir}/%{name}/relocatable/*.so.1.4w
-%{_libdir}/*.so.1.4w
+%{_libdir}/%{name}/relocatable/*.so.1.?w
+%{_libdir}/*.so.1.?w
%{_docdir}/%{name}
+%{_datadir}/%{name}
%files devel
%defattr(-,root,root,-)
-%doc CHANGE_172522
+%doc CHANGE_189208
%{_GNAT_project_dir}/%{name}*
%{_includedir}/%{name}
%{_libdir}/%{name}/relocatable/*.ali
@@ -91,11 +92,12 @@ chrpath --delete %{buildroot}/%{_bindir}/*
%changelog
-* Mon Jul 16 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-9
-- rebuild for new GtkAda
+* Tue Jul 17 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2012-2
+- Update to 2012
+- Fix library type in gpr
-* Sun Mar 04 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-8
-- rebuild for gprbuild-2011
+* Sun Mar 10 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-8
+- Rebuild for new gprbuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index bf338e1..c366e14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5baa9a13637c290738aff61737b6025 gnatcoll-gpl-2011-src.tgz
+cad3d737838139478b6306aa13c4c093 gnatcoll-gpl-2012-src.tgz
More information about the scm-commits
mailing list