The package rpms/gnatcoll.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gnatcoll.git/commit/?id=afeb4f42cfca....
Change: -%ifarch x86_64
Thanks.
Full change: ============
commit 7a5a2b0b32f603ff681bb5af3d7af9fedbb89dbc Author: Bjrn Persson Bjorn@Rombobjrn.se Date: Mon Mar 18 21:41:32 2019 +0100
Dropped patches.
diff --git a/gnatcoll-2016-optflags.patch b/gnatcoll-2016-optflags.patch deleted file mode 100644 index 13d01ce..0000000 --- a/gnatcoll-2016-optflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index cb70617..92dad5c 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,7 @@ shared relocatable: build_library_type/relocatable - - # Build either type of library. The argument (%) is the type of library to build - --GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -+GPRBLD_OPTS ?= -p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} - - build_library_type/%: generate_sources - @${RM} src/gnatcoll-atomic.adb diff --git a/gnatcoll-2017-disable_static.patch b/gnatcoll-2017-disable_static.patch deleted file mode 100644 index d3e243a..0000000 --- a/gnatcoll-2017-disable_static.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/Makefile 2017-07-19 21:52:46.203376052 +0200 -+++ b/Makefile.edit 2017-07-20 06:55:49.265234728 +0200 -@@ -8,7 +8,7 @@ - ifeq (${BUILDS_SHARED},yes) - # Additional targets. Builds relocatble first so that the tools are - # preferably linked statically. --all: relocatable static tools -+all: relocatable tools - install: install-clean install_static \ - install_library_type/relocatable \ - install_tools \ ---- a/Makefile 2017-07-20 08:23:50.070546782 +0200 -+++ b/Makefile.edit 2017-07-20 08:24:20.103396871 +0200 -@@ -27,8 +27,8 @@ - - static-pic: build_library_type/static-pic - --tools: build_tools/static --install_tools: install_tools/static -+tools: build_tools/relocatable -+install_tools: install_tools/relocatable - - ifeq (${BUILDS_STATIC_PIC},yes) - static: build_library_type/static build_library_type/static-pic ---- a/Makefile 2017-07-20 08:29:15.091954506 +0200 -+++ b/Makefile.edit 2017-07-20 08:30:13.335723884 +0200 -@@ -9,7 +9,7 @@ - # Additional targets. Builds relocatble first so that the tools are - # preferably linked statically. - all: relocatable tools --install: install-clean install_static \ -+install: install-clean \ - install_library_type/relocatable \ - install_tools \ - install_gps_plugin -@@ -23,22 +23,10 @@ - ####################################################################### - # build - --## Builds explicitly the shared or the static libraries -- --static-pic: build_library_type/static-pic - - tools: build_tools/relocatable - install_tools: install_tools/relocatable - --ifeq (${BUILDS_STATIC_PIC},yes) --static: build_library_type/static build_library_type/static-pic --install_static: install_library_type/static \ -- install_library_type/static-pic --else --static: build_library_type/static --install_static: install_library_type/static --endif -- - shared relocatable: build_library_type/relocatable - - # Build either type of library. The argument (%) is the type of library to build diff --git a/gnatcoll-2017-gprdir.patch b/gnatcoll-2017-gprdir.patch deleted file mode 100644 index 487a0bb..0000000 --- a/gnatcoll-2017-gprdir.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Makefile 2017-07-20 08:51:11.306087482 +0200 -+++ b/Makefile.edit 2017-07-20 08:52:04.396938587 +0200 -@@ -56,15 +56,17 @@ - ####################################################################### - # install - -+gprdir="lib/gnat" -+ - GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \ -- --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \ -+ --exec-subdir=${bindir} --project-subdir=${gprdir} -XXMLADA_BUILD=$(@F) \ - --lib-subdir=${libdir}/ --link-lib-subdir=${libdir} -v \ - --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F) - - install-clean: --ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gnatcoll)) -+ifneq (,$(wildcard $(prefix)/${gprdir}/manifests/gnatcoll)) - -$(GPRINSTALL) --uninstall -f \ -- --prefix=$(prefix) --project-subdir=lib/gnat gnatcoll -+ --prefix=$(prefix) --project-subdir=${gprdir} gnatcoll - endif - - diff --git a/gnatcoll-2017-libdir.patch b/gnatcoll-2017-libdir.patch deleted file mode 100644 index 93bdaee..0000000 --- a/gnatcoll-2017-libdir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile 2017-05-16 13:18:08.000000000 +0200 -+++ b/Makefile.edit 2017-07-19 16:47:50.426011893 +0200 -@@ -70,6 +70,7 @@ - - GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \ - --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \ -+ --lib-subdir=${libdir}/ --link-lib-subdir=${libdir} -v \ - --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F) - - install-clean: diff --git a/gnatcoll-2017-pyconfig.patch b/gnatcoll-2017-pyconfig.patch deleted file mode 100644 index 4baa128..0000000 --- a/gnatcoll-2017-pyconfig.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/aclocal.m4 2017-05-16 13:18:08.000000000 +0200 -+++ b/aclocal.m4.edit 2017-07-20 10:26:35.974653543 +0200 -@@ -815,7 +815,7 @@ - # Check that Python version is >= 2.0 - if test "$WITH_PYTHON" = "yes"; then - AC_MSG_CHECKING(for python >= 2.0) -- python_major_version=`$PYTHON -c 'import sys; print(sys.version_info[[0]])' 2>/dev/null` -+ python_major_version=`$PYTHON -c 'import sys; print(sys.version_info[[0]]))' 2>/dev/null` - python_version=`$PYTHON -c 'import sys; print(".".join([str(k) for k in sys.version_info]))' 2>/dev/null` - if test "$python_major_version" -lt 2; then - AC_MSG_RESULT(no, need at least version 2.0) -@@ -832,7 +832,7 @@ - result=`cat <<EOF | $PYTHON - from distutils.sysconfig import get_config_var, get_python_inc, get_config_vars - import sys --print 'PYTHON_VERSION=%s' % get_config_var("VERSION") -+print('PYTHON_VERSION=%s' % get_config_var("VERSION")) - python_current_prefix=sys.prefix - config_args = [[k.replace("'", "") for k in get_config_vars().get('CONFIG_ARGS','').split("' '")]] - python_build_prefix=[[k.replace('--prefix=', '') for k in config_args if k.startswith('--prefix=')]] -@@ -840,7 +840,7 @@ - python_build_prefix = python_build_prefix[[0]] - else: - python_build_prefix = sys.prefix --print 'PYTHON_BASE="%s"' % python_current_prefix -+print('PYTHON_BASE="%s"' % python_current_prefix) - libpl = get_config_var('LIBPL') - if not libpl: - libpl = '%s/libs' % python_current_prefix -@@ -854,12 +854,12 @@ - else: - if libdir.startswith(python_build_prefix) and not libdir.startswith(python_current_prefix): - libdir = libdir.replace(python_build_prefix, python_current_prefix, 1) --print 'PYTHON_STATIC_DIR="%s"' % libpl --print 'PYTHON_SHARED_DIR="%s"' % libdir -+print('PYTHON_STATIC_DIR="%s"' % libpl) -+print('PYTHON_SHARED_DIR="%s"' % libdir) - cflags = " ".join(("-I" + get_python_inc().replace(python_build_prefix, python_current_prefix, 1), - "-I" + get_python_inc(plat_specific=True).replace(python_build_prefix, python_current_prefix, 1))) --print 'PYTHON_CFLAGS="%s"' % cflags --print 'PYTHON_LIBS="%s %s %s"' % (get_config_vars().get("LIBS", ""), get_config_vars().get("SYSLIBS", ""), get_config_vars().get("MODLIBS", "")) -+print('PYTHON_CFLAGS="%s"' % cflags) -+print('PYTHON_LIBS="%s %s %s"' % (get_config_vars().get("LIBS", ""), get_config_vars().get("SYSLIBS", ""), get_config_vars().get("MODLIBS", ""))) - EOF - ` - eval "$result" ---- a/aclocal.m4 2017-07-20 11:12:58.691541442 +0200 -+++ b/aclocal.m4.edit 2017-07-20 11:17:33.473381204 +0200 -@@ -815,7 +815,7 @@ - # Check that Python version is >= 2.0 - if test "$WITH_PYTHON" = "yes"; then - AC_MSG_CHECKING(for python >= 2.0) -- python_major_version=`$PYTHON -c 'import sys; print(sys.version_info[[0]]))' 2>/dev/null` -+ python_major_version=`$PYTHON -c 'import sys; print(sys.version_info[[0]])' 2>/dev/null` - python_version=`$PYTHON -c 'import sys; print(".".join([str(k) for k in sys.version_info]))' 2>/dev/null` - if test "$python_major_version" -lt 2; then - AC_MSG_RESULT(no, need at least version 2.0) -diff --git a/src/dborm.py b/src/dborm.py -index 15ef56e..0027841 100755 ---- a/src/dborm.py -+++ b/src/dborm.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # This script should be compatible with both python 2 and python 3 - - import re
commit afeb4f42cfcae29ab445975f8e50bf532ff44b66 Author: Bjrn Persson Bjorn@Rombobjrn.se Date: Sat Mar 16 13:30:05 2019 +0100
Upgraded to gnatcoll-core 2018.
This is now the gnatcoll-core source package. gnatcoll-bindings and gnatcoll-db are separate source packages.
The subpackages gnatcoll and gnatcoll-devel are metapackages that pull in all the Gnatcoll packages to ensure a clean upgrade path. The documentation has been split off into a separate subpackage.
diff --git a/.gitignore b/.gitignore index d5a7c5f..b130f67 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /gnatcoll-gpl-2016-src.tar.gz /gnatcoll-gpl-2017-src.tar.gz /gnatcoll-2017-m1-src.tar.gz +/gnatcoll-core-gpl-2018-src.tar.gz diff --git a/gnatcoll.spec b/gnatcoll.spec index d967a1b..fe791b8 100644 --- a/gnatcoll.spec +++ b/gnatcoll.spec @@ -1,123 +1,211 @@ -%undefine _hardened_build -%global with_gtkada 1 - -Name: gnatcoll -Version: 2017 -Release: 16%{?dist} -Summary: Suite of reusable software components and utilities -License: GPLv2+ -URL: http://libre.adacore.com -## Direct link not available -Source0: %{name}-%{version}-m1-src.tar.gz -##Patch1: %{name}-2016-directories.patch -Patch2: %{name}-2016-optflags.patch -Patch3: gnatcoll-2017-libdir.patch -Patch4: %{name}-2017-disable_static.patch -## https://github.com/AdaCore/gnatcoll/pull/15 -Patch5: gnatcoll-2017-gprdir.patch -Patch6: gnatcoll-2017-pyconfig.patch -BuildRequires: fedora-gnat-project-common >= 2 -BuildRequires: gmp-devel autoconf -%if ! 0%{?fedora} >= 27 -BuildRequires: python2-devel -%endif -%if %with_gtkada -BuildRequires: GtkAda3-devel pygtk2-devel -%endif -BuildRequires: libpq-devel chrpath -BuildRequires: gprbuild >= 2017 libgpr-devel -BuildRequires: gcc-gnat readline-devel -BuildRequires: sqlite-devel xmlada-devel -# gprbuild only available on these: -ExclusiveArch: %GPRbuild_arches - - -%description -The GNAT Component Collection is a suite -of reusable software components and utilities. -It has been used by AdaCore in developing the GNAT tool set, -the GPS Integrated Development Environment, and GNAT Tracker, -its web-based customer support interface. +Name: gnatcoll +Version: 2018 +Release: 1%{?dist} +Summary: The GNAT Components Collection +Summary(sv): GNAT Components Collection + +License: GPLv3+ +# The source files are GPLv3+ and GPLv2+, except that getRSS.c is CC-BY. These +# combine into GPLv3+ on the binary code. +URL: https://github.com/AdaCore/gnatcoll-core +Source: http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99#/gnatcoll-core-g... +# The long hexadecimal number is what identifies the file on the server. +# Don't forget to update it! +# The latest known address of the download page is: +# https://www.adacore.com/download/more + +BuildRequires: gcc-gnat gprbuild make sed fedora-gnat-project-common +BuildRequires: libgpr-devel >= 2018 +BuildRequires: xmlada-devel +# Build only on architectures where GPRbuild is available: +ExclusiveArch: %{GPRbuild_arches} + +# The package "gnatcoll" is a metapackage that pulls in all the binary library +# packages to prevent problems when Fedora is upgraded: +Requires: gnatcoll-core gnatcoll-gmp gnatcoll-iconv +Requires: gnatcoll-readline gnatcoll-syslog +Requires: gnatcoll-db2ada gnatcoll_sql gnatcoll_postgres gnatcoll_sqlite +Requires: gnatcoll_xref gnatinspect + +%global common_description_en \ +The GNAT Components Collection is a library of general-purpose packages that \ +are part of the GNAT technology. The components complement the predefined Ada \ +and GNAT libraries and deal with a range of common programming issues \ +including string and text processing, memory management, and file handling. + +%global common_description_sv \ +GNAT Components Collection r ett bibliotek med universalpaket som ingr i \ +GNAT-sviten. Komponenterna kompletterar adas och GNATs frdefinierade \ +bibliotek, och lser diverse vanliga programmeringsproblem ssom strng- och \ +textbehandling, minneshantering och filhantering. + +%description %{common_description_en} + +Gnatcoll has been divided into separate modules. The gnatcoll package pulls in +the binaries of all the modules to prevent problems when Fedora is upgraded. + +Do not specify this package in any configurations or dependencies. Specify the +packages you actually need. + +%description -l sv %{common_description_sv} + +Gnatcoll har delats upp i skilda moduler. Paketet gnatcoll drar in alla +modulernas binrfiler fr att undvika problem nr Fedora uppgraderas. + +Ange inte det hr paketet i ngra konfigurationer eller beroenden. Ange paketen +du faktiskt behver. +
%package devel -Summary: Devel package for %{name} -License: GPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libpq-devel sqlite-devel -Requires: libgpr-devel +Summary: Development metapackage for the GNAT Components Collection +Summary(sv): Metapaket fr programmering med GNAT Components Collection +Requires: gnatcoll-core-devel gnatcoll-bindings-devel gnatcoll-db-devel + +%description devel %{common_description_en} + +Gnatcoll has been divided into separate modules. The gnatcoll-devel package +pulls in the development packages of all the modules to prevent problems when +Fedora is upgraded. + +Do not specify this package in any configurations or dependencies. Specify the +packages you actually need. + +%description devel -l sv %{common_description_sv} + +Gnatcoll har delats upp i skilda moduler. Paketet gnatcoll-devel drar in alla +modulernas programmeringspaket fr att undvika problem nr Fedora uppgraderas. + +Ange inte det hr paketet i ngra konfigurationer eller beroenden. Ange paketen +du faktiskt behver. + + +%package core +Summary: The GNAT Components Collection core packages +Summary(sv): GNAT Components Collection centrala paket + +%description core %{common_description_en} + +The gnatcoll-core package contains the core module of the GNAT Components +Collection. + +%description core -l sv %{common_description_sv} + +Paketet gnatcoll-core innehller den centrala modulen i GNAT Components +Collection. + + +%package core-devel +Summary: Development files for the GNAT Components Collection core packages +Summary(sv): Filer fr programmering med GNAT Components Collection centrala paket +Requires: gnatcoll-core%{?_isa} = %{version}-%{release} +Requires: fedora-gnat-project-common libgpr-devel xmlada-devel +Recommends: gnatcoll-doc +Suggests: gnatcoll-bindings-devel gnatcoll-db-devel + +%description core-devel %{common_description_en} + +The gnatcoll-core-devel package contains source code and linking information for +developing applications that use the GNAT Components Collection core packages. + +%description core-devel -l sv %{common_description_sv} + +Paketet gnatcoll-core-devel innehller kllkod och lnkningsinformation som +behvs fr att utveckla program som anvnder GNAT Components Collections +centrala paket. + + +%package doc +Summary: Documentation for the GNAT Components Collection core packages +Summary(sv): Dokumentation till GNAT Components Collection centrala paket +BuildArch: noarch +License: MIT and BSD +# The documents have an MIT-like license. Some Javascript and CSS files that +# Sphinx includes with the documentation are BSD- and MIT-licensed. + +%description doc %{common_description_en} + +The gnatcoll-doc package contains the documentation for the GNAT Components +Collection. + +%description doc -l sv %{common_description_sv} + +Paketet gnatcoll-doc innehller dokumentationen till GNAT Components Collection.
-%description devel -%{summary}
%prep -%setup -q -n %{name}-gpl-%{version}-src -##%%patch1 -p1 -%patch3 -p1 -b .libsubdir -%patch4 -p1 -b .static -%patch5 -p1 -b .gprdir -%patch6 -p1 -b .python +%autosetup -n gnatcoll-core-gpl-%{version}-src +
%build -%configure --enable-shared --enable-gpl \ - --with-readline --with-sqlite=/usr/include/ \ - %if 0%{?fedora} >= 27 - --without-python \ - %else - --with-python-exec=python \ - %endif - --enable-pygtk - -export BUILDS_SHARED="yes" -%if 0%{?fedora} >= 1 -make -j1 GPRBLD_OPTS="%GPRbuild_optflags" -%else -make -j1 GNAT_OPTFLAGS="%GNAT_optflags" -%endif +make build-relocatable 'GPRBUILD_OPTIONS=%{GPRbuild_optflags}'
%install -rm -rf %{buildroot} -export GPR_PROJECT_DIR=%_GNAT_project_dir libdir=%{_libdir} -export BUILDS_SHARED="yes" -make install DESTDIR=%{buildroot} prefix=%{buildroot}/%{_prefix} \ -libdir=%{buildroot}/%{_libdir} gprdir=%{buildroot}/%_GNAT_project_dir -rm -rf %{buildroot}/%{_libdir}/%{name}/static/* -rm -rf %{buildroot}/%{_datadir}/gps -mkdir -p %{buildroot}/%{_GNAT_project_dir}/ -%ifarch x86_64 -rm -rf %{buildroot}/%{_libdir}/gnat -%endif -chrpath --delete %{buildroot}/%{_libdir}/%{name}/lib%{name}*.so.* -chrpath --delete %{buildroot}/%{_bindir}/* -rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyc -rm -f %{buildroot}/%{_datadir}/%{name}/dborm.pyo -mv %{buildroot}/%{_datadir}/examples %{buildroot}/%{_datadir}/%{name} +make install-relocatable \ + 'prefix=%{buildroot}%{_prefix} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --ali-subdir=%{buildroot}%{_libdir}/%{name} \ + --no-lib-link -m' +# The makefile doesn't anticipate the need to pass additional parameters to +# GPRinstall, but it's possible to include them with the prefix and have them +# expanded as separate parameters. + +# These files aren't needed in the package. +rm %{buildroot}%{_pkgdocdir}/html/html/{.buildinfo,objects.inv} + +# Fix up some things that Adacore does wrong. +ln --symbolic --force libgnatcoll.so.%{version} %{buildroot}%{_libdir}/libgnatcoll.so +mv %{buildroot}%{_datadir}/examples/gnatcoll %{buildroot}%{_pkgdocdir}/examples +mv %{buildroot}%{_pkgdocdir}/html/html/* %{buildroot}%{_pkgdocdir}/html/ +rmdir %{buildroot}%{_pkgdocdir}/html/html + +# GPRinstall's manifest files are architecture-specific because they contain +# what seems to be checksums of architecture-specific files, so they must not +# be under _datadir. Their function is poorly documented, but they seem to be +# used when GPRinstall uninstalls packages. The manifest file is therefore +# irrelevant in this RPM package, so delete it. +rm --recursive --force %{buildroot}%{_GNAT_project_dir}/manifests + +# Make the generated usage project file architecture-independent. +sed --regexp-extended --in-place \ + '--expression=1i with "directories";' \ + '--expression=/^-- This project has been generated/d' \ + '--expression=s|^( *for +Source_Dirs +use +).*;$|\1(Directories.Includedir & "/%{name}");|i' \ + '--expression=s|^( *for +Library_Dir +use +).*;$|\1Directories.Libdir;|i' \ + '--expression=s|^( *for +Library_ALI_Dir +use +).*;$|\1Directories.Libdir & "/%{name}";|i' \ + %{buildroot}%{_GNAT_project_dir}/*.gpr + + +%check +%{_rpmconfigdir}/check-rpaths
%files -%{!?_licensedir:%global license %%doc} +# empty metapackage + +%files devel +# empty metapackage + +%files core %license COPYING3 -%doc README -%{_bindir}/* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/lib%{name}*.so.%{version} %{_libdir}/lib%{name}*.so.%{version} -%{_datadir}/%{name}
-%files devel -%doc CHANGE* -%doc %{_datadir}/doc/%{name}/ +%files core-devel %{_GNAT_project_dir}/%{name}* %{_includedir}/%{name} -%{_libdir}/%{name}/*.ali -%{_libdir}/%{name}/lib%{name}*.so +%{_libdir}/%{name} %{_libdir}/lib%{name}*.so -%{_GNAT_project_dir}/manifests/gnatcoll -
+%files doc +%{_pkgdocdir}
%changelog +* Thu Mar 14 2019 Bjrn Persson Bjorn@Rombobjrn.se - 2018-1 +- Upgraded to gnatcoll-core 2018. +- This is now the gnatcoll-core source package. gnatcoll-bindings and gnatcoll- + db are separate source packages. + * Sun Feb 17 2019 Igor Gnatenko ignatenkobrain@fedoraproject.org - 2017-16 - Rebuild for readline 8.0
diff --git a/sources b/sources index 203260f..efc136a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnatcoll-2017-m1-src.tar.gz) = 36d26598233d64f21a59bd6e849b9be940d400405e7d9718ab0fce4f73757d642184c62a341e2e0af9c36518ec8c0735641c804981250c453648852d8101015f +SHA512 (gnatcoll-core-gpl-2018-src.tar.gz) = bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
arch-excludes@lists.fedoraproject.org