From e83b742df07e289d8a94334702482f9e3c648510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 27 Mar 2016 23:50:06 +0200 Subject: [PATCH] Made a transitional xmlada-static-2013 in an attempt to get GPRbuild going on secondary architectures. --- xmlada.spec | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 33b876b..94f861b 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 11%{?dist} +Release: 11.1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -38,6 +38,21 @@ Requires: fedora-gnat-project-common >= 2 %description devel Xml library for ada devel package. + +%package static +Summary: XML library for Ada, static libraries +Group: Development/Libraries +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +This package contains the XML/Ada libraries for static linking. It is needed +for linking GPRbuild statically so that GPRbuild will remain functional when +libraries are upgraded. + +Other Fedora packages shall require xmlada-devel rather than xmlada-static if +possible. + + %prep %setup -q -n xmlada-gpl-%{version}-src %patch0 -p1 @@ -45,7 +60,7 @@ Xml library for ada devel package. %patch2 -p1 %build -%configure --disable-rpath --enable-shared --disable-static +%configure --disable-rpath --enable-shared --enable-static make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes @@ -64,7 +79,6 @@ install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ ## There is not GNAT programming studio in Fedora ## To enable GPS plugin delete this string and create subpackage rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* -rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib %files @@ -73,7 +87,6 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %dir %{_libdir}/%{name} %{_docdir}/%{name} %dir %{_libdir}/%{name}/relocatable -%dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* %{_libdir}/lib%{name}_input_sources.so.* %{_libdir}/lib%{name}_schema.so.* @@ -106,8 +119,14 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %{_libdir}/lib%{name}*.so +%files static +%{_libdir}/%{name}/static + %changelog +* Sun Mar 27 2016 Björn Persson - 2013-11.1 +- Added a -static subpackage for linking GPRbuild statically. + * Wed Apr 29 2015 Peter Robinson 2013-11 - rebuild (gcc / gnat 5)