From 25c79a6074c7e5b5cde38524fe1e655e2fb08433 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 4 Mar 2011 17:11:19 +0300 Subject: [PATCH 001/137] Initial import (#675388) --- .gitignore | 1 + sources | 1 + xmlada-destdir.patch | 152 +++++++++++++++++++++++++++++++++++++++++ xmlada-gnatflags.patch | 19 ++++++ xmlada-gpr.patch | 97 ++++++++++++++++++++++++++ xmlada.spec | 132 +++++++++++++++++++++++++++++++++++ 6 files changed, 402 insertions(+) create mode 100644 xmlada-destdir.patch create mode 100644 xmlada-gnatflags.patch create mode 100644 xmlada-gpr.patch create mode 100644 xmlada.spec diff --git a/.gitignore b/.gitignore index e69de29..38da341 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/xmlada-gpl-3.2.1-src.tgz diff --git a/sources b/sources index e69de29..68d590f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f52e66adee5cdf7d8b7c7454d0cbc196 xmlada-gpl-3.2.1-src.tgz diff --git a/xmlada-destdir.patch b/xmlada-destdir.patch new file mode 100644 index 0000000..cb68ecd --- /dev/null +++ b/xmlada-destdir.patch @@ -0,0 +1,152 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,8 +1,8 @@ + ## The type of library we want to build. Possible values: + ## relocatable + ## static +-LIBRARY_TYPE=static +- ++LIBRARY_TYPE=relocatable ++DESTDIR ?= + # Replace with the location for the installation directory + INSTALL=@INSTALL@ + PACKAGE_TARNAME=@PACKAGE_TARNAME@ +@@ -50,8 +50,8 @@ + .PHONY: all obj clean install install_dirs build_library_type install_library_type + + ifeq (${BUILDS_SHARED},yes) +-all: static relocatable +-install: install_static install_relocatable ++all: relocatable ++install: install_relocatable + else + all: static + install: install_static +@@ -64,17 +64,17 @@ + ${MAKE} LIBRARY_TYPE=relocatable build_library_type + + obj: force +- ${GNATMAKE} -p -Punicode/unicode.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Pinput_sources/input_sources.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Psax/sax.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Pdom/dom.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Pschema/schema.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Punicode/unicode.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Pinput_sources/input_sources.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Psax/sax.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Pdom/dom.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Pschema/schema.gpr ${MAKE_ARGS} + + test: force +- ${GNATMAKE} -p -Punicode/test/unicode_test.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Psax/test/sax_test.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Pdom/test/dom_test.gpr ${MAKE_ARGS} +- ${GNATMAKE} -p -Pschema/test/schema_test.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Punicode/test/unicode_test.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Psax/test/sax_test.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Pdom/test/dom_test.gpr ${MAKE_ARGS} ++ ${GNATMAKE} -R -p -Pschema/test/schema_test.gpr ${MAKE_ARGS} + + run_test: force + @cd unicode/test; ./test_unicode +@@ -88,57 +88,55 @@ + + # Rule for installing the modules + %_inst: force +- ${CP} $*/*.ad[bs] ${includedir}/xmlada +- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr +- -cd ${xmllib}; ${CHMOD} ugo+w *.ali +- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} +- ${RM} ${libdir}/libxmlada_$** +- ${RM} ${xmllib}libxmlada_$** ++ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada ++ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr ++ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali ++ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} ++ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** ++ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** + ifeq (${LIBRARY_TYPE},static) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} + else + ifeq (${OS},Windows_NT) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${DESTDIR}/${xmllib} + cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} + else +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} + endif + endif +- cd ${xmllib}; ${CHMOD} ugo-w *.ali ++ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali + + install_dirs: force +- @${MKDIR} ${bindir} +- @${MKDIR} ${xmllib} +- @${MKDIR} ${libdir}/gnat/xmlada +- @${MKDIR} ${datadir}/doc/xmlada +- @${MKDIR} ${includedir}/xmlada +- @${MKDIR} ${datadir}/gps/plug-ins/ ++ @${MKDIR} ${DESTDIR}/${bindir} ++ @${MKDIR} ${DESTDIR}/${xmllib} ++ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada ++ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada ++ @${MKDIR} ${DESTDIR}/${includedir}/xmlada ++ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for either shared or static, depending on + ## $LIBRARY_TYPE + install_library_type: install_dirs ${MODULE_INSTALL} +- ${INSTALL} distrib/xmlada_shared.gpr ${libdir}/gnat +- ${INSTALL} distrib/xmlada.gpr ${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_dom.gpr ${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_sax.gpr ${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_input.gpr ${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_schema.gpr ${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_unicode.gpr ${libdir}/gnat/ +- ${INSTALL} xmlada-config ${bindir} +- -${INSTALL} docs/xml.ps ${datadir}/doc/xmlada 2>/dev/null +- -${INSTALL} docs/xml.pdf ${datadir}/doc/xmlada +- -${INSTALL} docs/xml.html ${datadir}/doc/xmlada +- -${INSTALL} docs/xml.info ${datadir}/doc/xmlada +- ${CHMOD} +x ${bindir}/xmlada-config +- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} ++ -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null ++ -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada ++ -${INSTALL} docs/xml.html ${DESTDIR}/${datadir}/doc/xmlada ++ -${INSTALL} docs/xml.info ${DESTDIR}/${datadir}/doc/xmlada ++ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config ++ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for an explicit target +-install_static: +- ${MAKE} LIBRARY_TYPE=static install_library_type + install_shared install_relocatable: + ${MAKE} LIBRARY_TYPE=relocatable install_library_type + +@@ -153,7 +151,7 @@ + -gnat clean -XLIBRARY_TYPE=$* -q -Psax/test/sax_test.gpr + -gnat clean -XLIBRARY_TYPE=$* -q -Pschema/test/schema_test.gpr + +-clean: clean_relocatable clean_static ++clean: clean_relocatable + cd docs; ${MAKE} -e clean + + distclean: clean diff --git a/xmlada-gnatflags.patch b/xmlada-gnatflags.patch new file mode 100644 index 0000000..7120a49 --- /dev/null +++ b/xmlada-gnatflags.patch @@ -0,0 +1,19 @@ +--- a/Makefile.in 2011-02-20 17:55:26.420257717 +0300 ++++ b/Makefile.in 2011-02-20 17:56:13.768263891 +0300 +@@ -3,6 +3,7 @@ + ## static + LIBRARY_TYPE=relocatable + DESTDIR ?= ++GNATFLAGS ?= + # Replace with the location for the installation directory + INSTALL=@INSTALL@ + PACKAGE_TARNAME=@PACKAGE_TARNAME@ +@@ -18,7 +19,7 @@ + docdir=@docdir@ + includedir=@includedir@ + +-GNATMAKE=@gnatmake@ ++GNATMAKE=@gnatmake@ ${GNATFLAGS} + + # Compiler mode: one of "distrib", "debug", "optimize", "profile" + MODE=distrib diff --git a/xmlada-gpr.patch b/xmlada-gpr.patch new file mode 100644 index 0000000..fde55ea --- /dev/null +++ b/xmlada-gpr.patch @@ -0,0 +1,97 @@ +--- a/distrib/xmlada_dom.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada_dom.gpr 2011-03-01 12:17:54.631541017 +0300 +@@ -1,12 +1,13 @@ ++with "directories"; + with "xmlada_shared"; + with "xmlada_sax"; + project XmlAda_Dom is + for Library_Name use "xmlada_dom"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); + for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; +- for Library_Dir use "../xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; + for Library_Version use + "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; + for Externally_Built use "true"; +--- a/distrib/xmlada_sax.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada_sax.gpr 2011-03-01 12:17:54.633540891 +0300 +@@ -1,3 +1,4 @@ ++with "directories"; + with "xmlada_shared"; + with "xmlada_input"; + with "xmlada_unicode"; +@@ -5,9 +6,9 @@ + for Library_Name use "xmlada_sax"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); + for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; +- for Library_Dir use "../xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; + for Library_Version use + "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; + for Externally_Built use "true"; +--- a/distrib/xmlada_input.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada_input.gpr 2011-03-01 12:17:54.632540953 +0300 +@@ -1,12 +1,13 @@ ++with "directories"; + with "xmlada_shared"; + with "xmlada_unicode"; + project XmlAda_Input is + for Library_Name use "xmlada_input_sources"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); + for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; +- for Library_Dir use "../xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; + for Library_Version use + "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; + for Externally_Built use "true"; +--- a/distrib/xmlada.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada.gpr 2011-03-01 12:17:54.632540953 +0300 +@@ -1,3 +1,4 @@ ++with "directories"; + -- Project file for use of XML/Ada. + -- Put the directory that contains xmlada.gpr in your ADA_PROJECT_PATH + -- variable. Then, in our own project file, add a "with" dependency on +--- a/distrib/xmlada_schema.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada_schema.gpr 2011-03-01 12:17:54.633540891 +0300 +@@ -1,12 +1,13 @@ ++with "directories"; + with "xmlada_shared"; + with "xmlada_dom"; + project XmlAda_Schema is + for Library_Name use "xmlada_schema"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); + for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; +- for Library_Dir use "../xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; + for Library_Version use + "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; + for Externally_Built use "true"; +--- a/distrib/xmlada_unicode.gpr 2011-03-01 12:18:26.928536602 +0300 ++++ b/distrib/xmlada_unicode.gpr 2011-03-01 12:17:54.633540891 +0300 +@@ -1,11 +1,12 @@ ++with "directories"; + with "xmlada_shared"; + project XmlAda_Unicode is + for Library_Name use "xmlada_unicode"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); + for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; +- for Library_Dir use "../xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; + for Library_Version use + "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; + for Externally_Built use "true"; diff --git a/xmlada.spec b/xmlada.spec new file mode 100644 index 0000000..034ed3f --- /dev/null +++ b/xmlada.spec @@ -0,0 +1,132 @@ +Name: xmlada +Version: 3.2.1 +Release: 9%{?dist} +Summary: XML library for Ada +Group: System Environment/Libraries +License: GPLv2+ +URL: http://libre.adacore.com +## Direct download link is unavailable +## http://libre.adacore.com/libre/download/ +Source0: xmlada-gpl-3.2.1-src.tgz +## Patch for use relocatable libs instead static +## and add DESTDIR option for make install +Patch0: %{name}-destdir.patch +## Fedora-specific +Patch1: %{name}-gpr.patch +Patch2: %{name}-gnatflags.patch +BuildRequires: chrpath +BuildRequires: gcc-gnat +BuildRequires: fedora-gnat-project-common >= 2 + +%description +XML/Ada includes support for parsing XML files, including DTDs, +full support for SAX, +and an almost complete support for the core part of the DOM. +It includes support for validating XML files with XML schemas. + +%package devel +Summary: XML library for Ada devel package +Group: Development/Libraries +License: GPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: fedora-gnat-project-common >= 2 + +%description devel +Xml library for ada devel package. + +%prep +%setup -q -n xmlada-3.2.1-src +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +%configure --disable-rpath +make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir +## Revoke exec permissions +find %{buildroot} -name '*.gpr' -exec chmod -x {} \; +find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; +## Delete old bash script (not needed now) +rm -f %{buildroot}%{_bindir}/xmlada-config +## delete rpath manually (#674793) +chrpath --delete %{buildroot}%{_libdir}/libxmlada* +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* + +%files +%defattr(-,root,root,-) +%doc README TODO AUTHORS COPYING +%dir %{_libdir}/%{name} +%dir %{_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.* +%{_libdir}/lib%{name}_unicode.so.* +%{_libdir}/lib%{name}_sax.so.* +%{_libdir}/%{name}/relocatable/lib%{name}*.so.* +%{_docdir}/%{name}/xml.html +%{_docdir}/%{name}/xml.info +%{_docdir}/%{name}/xml.pdf + + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/%{name} +%dir %{_GNAT_project_dir}/%{name} +%{_GNAT_project_dir}/%{name}.gpr +%{_GNAT_project_dir}/xmlada_shared.gpr +%{_GNAT_project_dir}/%{name}/xmlada_dom.lgpr +%{_GNAT_project_dir}/%{name}/xmlada_input_sources.lgpr +%{_GNAT_project_dir}/%{name}/xmlada_sax.lgpr +%{_GNAT_project_dir}/%{name}/xmlada_schema.lgpr +%{_GNAT_project_dir}/%{name}/xmlada_unicode.lgpr +%{_GNAT_project_dir}/%{name}_dom.gpr +%{_GNAT_project_dir}/%{name}_input.gpr +%{_GNAT_project_dir}/%{name}_sax.gpr +%{_GNAT_project_dir}/%{name}_schema.gpr +%{_GNAT_project_dir}/%{name}_unicode.gpr +%{_includedir}/%{name}/*.adb +%{_includedir}/%{name}/*.ads +%{_libdir}/%{name}/relocatable/*.ali +%{_libdir}/%{name}/relocatable/lib%{name}*.so + + + +%changelog +* Tue Mar 01 2011 Pavel Zhukov - 3.2.1-9 +- use macros _GNAT_project_di +- fix hardcode includedir +- fix BuildRequires +- fix owned dir +- fix ?_isa + +* Sun Feb 20 2011 Pavel Zhukov - 3.2.1-8 +- fix spec errors +- fix directories for rawhide +- fix gcc-4.6 issues +- fix libdir + +* Fri Feb 11 2011 Pavel Zhukov - 3.2.1-6 +- move gpr to /usr/share/gpr(/xmlada) + +* Mon Feb 7 2011 Pavel Zhukov - 3.2.1-5 +- move so to -devel package fix spec errors + +* Sun Feb 6 2011 Pavel Zhukov - 3.2.1-4 +- fix dir owner + +* Sat Feb 5 2011 Pavel Zhukov - 3.2.1-3 +- fix errors in Makefile +- fix files list + +* Fri Feb 4 2011 Pavel Zhukov - 3.2.1-1 +- Initial spec From 64e5a411b9dd766c3746e56abe30a9dce5c0bcb2 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 18 Mar 2011 21:14:14 +0300 Subject: [PATCH 002/137] Fix #688986 --- xmlada-gpr.patch | 10 +++++----- xmlada.spec | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xmlada-gpr.patch b/xmlada-gpr.patch index fde55ea..74384fe 100644 --- a/xmlada-gpr.patch +++ b/xmlada-gpr.patch @@ -12,7 +12,7 @@ + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; @@ -31,7 +31,7 @@ + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; @@ -49,7 +49,7 @@ + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; @@ -74,7 +74,7 @@ + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; @@ -91,7 +91,7 @@ + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "xmlada/" & Project'Library_Kind; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; diff --git a/xmlada.spec b/xmlada.spec index 034ed3f..ef3636f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -102,6 +102,9 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %changelog +* Fri Mar 18 2011 Pavel Zhukov - 3.2.1-10 +- Fix #688986 + * Tue Mar 01 2011 Pavel Zhukov - 3.2.1-9 - use macros _GNAT_project_di - fix hardcode includedir From 299016b30a2b9ceab84c28e80016657fa9c4d3f1 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 18 Mar 2011 21:20:19 +0300 Subject: [PATCH 003/137] Fix #688986 --- xmlada.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index ef3636f..5d95cb0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 3.2.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -102,8 +102,8 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %changelog -* Fri Mar 18 2011 Pavel Zhukov - 3.2.1-10 -- Fix #688986 +* Tue Mar 01 2011 Pavel Zhukov - 3.2.1-10 +- fix path for fedora-gnat-project-common * Tue Mar 01 2011 Pavel Zhukov - 3.2.1-9 - use macros _GNAT_project_di @@ -112,24 +112,24 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* - fix owned dir - fix ?_isa -* Sun Feb 20 2011 Pavel Zhukov - 3.2.1-8 +* Sun Feb 20 2011 Pavel Zhukov - 3.2.1-8 - fix spec errors - fix directories for rawhide - fix gcc-4.6 issues - fix libdir -* Fri Feb 11 2011 Pavel Zhukov - 3.2.1-6 +* Fri Feb 11 2011 Pavel Zhukov - 3.2.1-6 - move gpr to /usr/share/gpr(/xmlada) -* Mon Feb 7 2011 Pavel Zhukov - 3.2.1-5 +* Mon Feb 7 2011 Pavel Zhukov - 3.2.1-5 - move so to -devel package fix spec errors -* Sun Feb 6 2011 Pavel Zhukov - 3.2.1-4 +* Sun Feb 6 2011 Pavel Zhukov - 3.2.1-4 - fix dir owner -* Sat Feb 5 2011 Pavel Zhukov - 3.2.1-3 +* Sat Feb 5 2011 Pavel Zhukov - 3.2.1-3 - fix errors in Makefile - fix files list -* Fri Feb 4 2011 Pavel Zhukov - 3.2.1-1 +* Fri Feb 4 2011 Pavel Zhukov - 3.2.1-1 - Initial spec From ea0224cb606169161bf89e6ca6187d0e73333f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 23 Mar 2011 10:31:35 +0100 Subject: [PATCH 004/137] updated the supported arch list --- xmlada.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 5d95cb0..f5f3fe1 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 3.2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -17,6 +17,8 @@ Patch2: %{name}-gnatflags.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 +# gcc-gnat only available on these: +ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha %description XML/Ada includes support for parsing XML files, including DTDs, @@ -102,6 +104,9 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %changelog +* Wed Mar 23 2011 Dan Horák - 3.2.1-11 +- updated the supported arch list + * Tue Mar 01 2011 Pavel Zhukov - 3.2.1-10 - fix path for fedora-gnat-project-common From 291ae26af2f4f1ffee3f4da6346b8f94a6eecfd5 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 30 Mar 2011 14:41:36 +0400 Subject: [PATCH 005/137] Fix libraries types (#692054) --- xmlada.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index f5f3fe1..17f8424 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -17,8 +17,6 @@ Patch2: %{name}-gnatflags.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 -# gcc-gnat only available on these: -ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha %description XML/Ada includes support for parsing XML files, including DTDs, @@ -43,7 +41,7 @@ Xml library for ada devel package. %patch2 -p1 %build -%configure --disable-rpath +%configure --disable-rpath --enable-shared --disable-static make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir @@ -104,8 +102,8 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %changelog -* Wed Mar 23 2011 Dan Horák - 3.2.1-11 -- updated the supported arch list +* Wed Mar 30 2011 Pavel Zhukov - 3.2.1-11 +- Fix library type (add configure options) * Tue Mar 01 2011 Pavel Zhukov - 3.2.1-10 - fix path for fedora-gnat-project-common From 23779a03656d4b07809bd45f9f814ef71589641b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 16 Jul 2011 12:25:46 +0400 Subject: [PATCH 006/137] Update to new release --- .gitignore | 1 + sources | 2 +- ...-destdir.patch => xmlada-4.1-destdir.patch | 211 +++++++++--------- ...tflags.patch => xmlada-4.1-gnatflags.patch | 14 +- xmlada.spec | 25 ++- 5 files changed, 134 insertions(+), 119 deletions(-) rename xmlada-destdir.patch => xmlada-4.1-destdir.patch (61%) rename xmlada-gnatflags.patch => xmlada-4.1-gnatflags.patch (50%) diff --git a/.gitignore b/.gitignore index 38da341..812bbbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xmlada-gpl-3.2.1-src.tgz +/xmlada-gpl-4.1-src.tgz diff --git a/sources b/sources index 68d590f..3dfd44e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f52e66adee5cdf7d8b7c7454d0cbc196 xmlada-gpl-3.2.1-src.tgz +c17ac563b8375bd652a0eb8e141cda59 xmlada-gpl-4.1-src.tgz diff --git a/xmlada-destdir.patch b/xmlada-4.1-destdir.patch similarity index 61% rename from xmlada-destdir.patch rename to xmlada-4.1-destdir.patch index cb68ecd..f501632 100644 --- a/xmlada-destdir.patch +++ b/xmlada-4.1-destdir.patch @@ -1,93 +1,16 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,8 +1,8 @@ - ## The type of library we want to build. Possible values: +--- a/Makefile.in 2011-07-16 11:17:09.335569486 +0400 ++++ b/Makefile.in 2011-07-16 11:19:13.406569528 +0400 +@@ -2,7 +2,7 @@ ## relocatable ## static --LIBRARY_TYPE=static + LIBRARY_TYPE=static - -+LIBRARY_TYPE=relocatable +DESTDIR ?= # Replace with the location for the installation directory INSTALL=@INSTALL@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ -@@ -50,8 +50,8 @@ - .PHONY: all obj clean install install_dirs build_library_type install_library_type - - ifeq (${BUILDS_SHARED},yes) --all: static relocatable --install: install_static install_relocatable -+all: relocatable -+install: install_relocatable - else - all: static - install: install_static -@@ -64,17 +64,17 @@ - ${MAKE} LIBRARY_TYPE=relocatable build_library_type - - obj: force -- ${GNATMAKE} -p -Punicode/unicode.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Pinput_sources/input_sources.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Psax/sax.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Pdom/dom.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Pschema/schema.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Punicode/unicode.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Pinput_sources/input_sources.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Psax/sax.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Pdom/dom.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Pschema/schema.gpr ${MAKE_ARGS} - - test: force -- ${GNATMAKE} -p -Punicode/test/unicode_test.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Psax/test/sax_test.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Pdom/test/dom_test.gpr ${MAKE_ARGS} -- ${GNATMAKE} -p -Pschema/test/schema_test.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Punicode/test/unicode_test.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Psax/test/sax_test.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Pdom/test/dom_test.gpr ${MAKE_ARGS} -+ ${GNATMAKE} -R -p -Pschema/test/schema_test.gpr ${MAKE_ARGS} - - run_test: force - @cd unicode/test; ./test_unicode -@@ -88,57 +88,55 @@ - - # Rule for installing the modules - %_inst: force -- ${CP} $*/*.ad[bs] ${includedir}/xmlada -- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr -- -cd ${xmllib}; ${CHMOD} ugo+w *.ali -- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} -- ${RM} ${libdir}/libxmlada_$** -- ${RM} ${xmllib}libxmlada_$** -+ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada -+ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr -+ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali -+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} -+ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** -+ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** - ifeq (${LIBRARY_TYPE},static) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} - else - ifeq (${OS},Windows_NT) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${DESTDIR}/${xmllib} - cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} - else -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} - endif - endif -- cd ${xmllib}; ${CHMOD} ugo-w *.ali -+ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali +@@ -114,30 +114,30 @@ + cd ${xmllib}; ${CHMOD} ugo-w *.ali install_dirs: force - @${MKDIR} ${bindir} @@ -98,7 +21,7 @@ - @${MKDIR} ${datadir}/gps/plug-ins/ + @${MKDIR} ${DESTDIR}/${bindir} + @${MKDIR} ${DESTDIR}/${xmllib} -+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada ++ @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada + @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada + @${MKDIR} ${DESTDIR}/${includedir}/xmlada + @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ @@ -120,13 +43,13 @@ - -${INSTALL} docs/xml.info ${datadir}/doc/xmlada - ${CHMOD} +x ${bindir}/xmlada-config - ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/ + ${INSTALL} xmlada-config ${DESTDIR}/${bindir} + -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null + -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada @@ -136,17 +59,99 @@ + ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ ## Do the installation for an explicit target --install_static: -- ${MAKE} LIBRARY_TYPE=static install_library_type - install_shared install_relocatable: - ${MAKE} LIBRARY_TYPE=relocatable install_library_type + install_static: +--- a/Makefile.in 2011-07-16 11:21:57.232569582 +0400 ++++ b/Makefile.in 2011-07-16 11:22:12.952569588 +0400 +@@ -1,7 +1,7 @@ + ## The type of library we want to build. Possible values: + ## relocatable + ## static +-LIBRARY_TYPE=static ++LIBRARY_TYPE=relocatable + DESTDIR ?= + # Replace with the location for the installation directory + INSTALL=@INSTALL@ +--- a/Makefile.in 2011-07-16 11:27:57.295569704 +0400 ++++ b/Makefile.in 2011-07-16 11:30:25.628569754 +0400 +@@ -91,27 +91,27 @@ -@@ -153,7 +151,7 @@ - -gnat clean -XLIBRARY_TYPE=$* -q -Psax/test/sax_test.gpr - -gnat clean -XLIBRARY_TYPE=$* -q -Pschema/test/schema_test.gpr + # Rule for installing the modules + %_inst: force +- ${CP} $*/*.ad[bs] ${includedir}/xmlada +- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr +- -cd ${xmllib}; ${CHMOD} ugo+w *.ali +- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} +- ${RM} ${libdir}/libxmlada_$** +- ${RM} ${xmllib}libxmlada_$** ++ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada ++ cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr ++ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali ++ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} ++ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** ++ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** + ifeq (${LIBRARY_TYPE},static) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} + else + ifeq (${OS},Windows_NT) + ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} + cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} + else +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} + endif + endif +- cd ${xmllib}; ${CHMOD} ugo-w *.ali ++ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali --clean: clean_relocatable clean_static -+clean: clean_relocatable - cd docs; ${MAKE} -e clean - - distclean: clean + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} +--- a/Makefile.in 2011-07-16 11:47:49.580570102 +0400 ++++ b/Makefile.in 2011-07-16 11:49:47.465570142 +0400 +@@ -92,7 +92,7 @@ + # Rule for installing the modules + %_inst: force + ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada +- cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr ++ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr + -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali + -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} + ${RM} ${DESTDIR}/${libdir}/libxmlada_$** +@@ -116,7 +116,7 @@ + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} + @${MKDIR} ${DESTDIR}/${xmllib} +- @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada ++ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada + @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada + @${MKDIR} ${DESTDIR}/${includedir}/xmlada + @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ +@@ -124,13 +124,13 @@ + ## Do the installation for either shared or static, depending on + ## $LIBRARY_TYPE + install_library_type: install_dirs ${MODULE_INSTALL} +- ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat +- ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/ +- ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ + ${INSTALL} xmlada-config ${DESTDIR}/${bindir} + -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null + -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada diff --git a/xmlada-gnatflags.patch b/xmlada-4.1-gnatflags.patch similarity index 50% rename from xmlada-gnatflags.patch rename to xmlada-4.1-gnatflags.patch index 7120a49..6f1008d 100644 --- a/xmlada-gnatflags.patch +++ b/xmlada-4.1-gnatflags.patch @@ -1,5 +1,5 @@ ---- a/Makefile.in 2011-02-20 17:55:26.420257717 +0300 -+++ b/Makefile.in 2011-02-20 17:56:13.768263891 +0300 +--- a/Makefile.in 2011-07-16 12:05:27.728570456 +0400 ++++ b/Makefile.in 2011-07-16 12:06:24.945570476 +0400 @@ -3,6 +3,7 @@ ## static LIBRARY_TYPE=relocatable @@ -8,12 +8,12 @@ # Replace with the location for the installation directory INSTALL=@INSTALL@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ -@@ -18,7 +19,7 @@ - docdir=@docdir@ - includedir=@includedir@ +@@ -20,7 +21,7 @@ --GNATMAKE=@gnatmake@ -+GNATMAKE=@gnatmake@ ${GNATFLAGS} + # Set a default value (ignored if set in the environment) + PROCESSORS?=1 +-GNATMAKE=@gnatmake@ -j${PROCESSORS} ++GNATMAKE=@gnatmake@ ${GNATFLAGS} # Compiler mode: one of "distrib", "debug", "optimize", "profile" MODE=distrib diff --git a/xmlada.spec b/xmlada.spec index 17f8424..add269d 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,19 +1,19 @@ Name: xmlada -Version: 3.2.1 -Release: 11%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-3.2.1-src.tgz +Source0: xmlada-gpl-%{version}-src.tgz ## Patch for use relocatable libs instead static ## and add DESTDIR option for make install -Patch0: %{name}-destdir.patch +Patch0: %{name}-%{version}-destdir.patch ## Fedora-specific Patch1: %{name}-gpr.patch -Patch2: %{name}-gnatflags.patch +Patch2: %{name}-%{version}-gnatflags.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 @@ -35,7 +35,7 @@ Requires: fedora-gnat-project-common >= 2 Xml library for ada devel package. %prep -%setup -q -n xmlada-3.2.1-src +%setup -q -n xmlada-4.1-src %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -47,18 +47,23 @@ make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_proje %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir +export BUILDS_SHARED=yes +make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; ## Delete old bash script (not needed now) rm -f %{buildroot}%{_bindir}/xmlada-config ## delete rpath manually (#674793) -chrpath --delete %{buildroot}%{_libdir}/libxmlada* +chrpath --delete %{buildroot}%{_libdir}/%{name}/relocatable/libxmlada* 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 +find %{buildroot}/%{_libdir}/ -type f -exec chmod -x {} \; +find %{buildroot}/%_GNAT_project_dir -type f -exec chmod -x {} \; %files %defattr(-,root,root,-) @@ -78,6 +83,7 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %{_docdir}/%{name}/xml.pdf + %files devel %defattr(-,root,root,-) %dir %{_includedir}/%{name} @@ -102,6 +108,9 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* %changelog +* Sat Jul 15 2011 Pavel Zhukov - 4.1-1 +- Update to new release GNAT-GPL-2011 + * Wed Mar 30 2011 Pavel Zhukov - 3.2.1-11 - Fix library type (add configure options) From db95d1ffc1c88e403d2847b1423472e8370f8fab Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 16 Jul 2011 13:39:00 +0400 Subject: [PATCH 007/137] Fix files perms --- xmlada.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index add269d..b155ab8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,19 +1,19 @@ -Name: xmlada -Version: 4.1 -Release: 1%{?dist} -Summary: XML library for Ada -Group: System Environment/Libraries -License: GPLv2+ -URL: http://libre.adacore.com +Name: xmlada +Version: 4.1 +Release: 2%{?dist} +Summary: XML library for Ada +Group: System Environment/Libraries +License: GPLv2+ +URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-%{version}-src.tgz +Source0: xmlada-gpl-%{version}-src.tgz ## Patch for use relocatable libs instead static ## and add DESTDIR option for make install -Patch0: %{name}-%{version}-destdir.patch +Patch0: %{name}-%{version}-destdir.patch ## Fedora-specific -Patch1: %{name}-gpr.patch -Patch2: %{name}-%{version}-gnatflags.patch +Patch1: %{name}-gpr.patch +Patch2: %{name}-%{version}-gnatflags.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 @@ -29,7 +29,7 @@ Summary: XML library for Ada devel package Group: Development/Libraries License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: fedora-gnat-project-common >= 2 +Requires: fedora-gnat-project-common >= 2 %description devel Xml library for ada devel package. @@ -62,8 +62,6 @@ install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib -find %{buildroot}/%{_libdir}/ -type f -exec chmod -x {} \; -find %{buildroot}/%_GNAT_project_dir -type f -exec chmod -x {} \; %files %defattr(-,root,root,-) @@ -108,8 +106,9 @@ find %{buildroot}/%_GNAT_project_dir -type f -exec chmod -x {} \; %changelog -* Sat Jul 15 2011 Pavel Zhukov - 4.1-1 +* Sat Jul 15 2011 Pavel Zhukov - 4.1-2 - Update to new release GNAT-GPL-2011 +- Fix permissions * Wed Mar 30 2011 Pavel Zhukov - 3.2.1-11 - Fix library type (add configure options) From 65ee2150817da04de56a6b3bea49a74c18fbd32d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 10 Jan 2012 16:40:46 +0400 Subject: [PATCH 008/137] GCC-4.7 rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index b155ab8..a32fceb 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -106,6 +106,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Tue Jan 10 2012 Pavel Zhukov - 4.1-3 +- Rebuild for new GCC-4.7 + * Sat Jul 15 2011 Pavel Zhukov - 4.1-2 - Update to new release GNAT-GPL-2011 - Fix permissions From 0898adc4c9852a044bf6a7c4730cf04a556bfc6a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:49:44 -0500 Subject: [PATCH 009/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a32fceb..4a7421e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -106,6 +106,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Jan 10 2012 Pavel Zhukov - 4.1-3 - Rebuild for new GCC-4.7 From f04ea97fe7d60ac68d99844d8353ab3d2bb8a5bb Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 18 Dec 2012 14:24:48 +0400 Subject: [PATCH 010/137] New release 4.3 (2012) --- .gitignore | 1 + sources | 2 +- xmlada-4.1-destdir.patch | 157 ----------------- xmlada-4.1-gnatflags.patch | 19 --- xmlada-4.3-destdir.patch | 207 +++++++++++++++++++++++ xmlada-4.3-gnatflags.patch | 12 ++ xmlada-gpr.patch => xmlada-4.3-gpr.patch | 94 +++++----- xmlada.spec | 26 +-- 8 files changed, 287 insertions(+), 231 deletions(-) delete mode 100644 xmlada-4.1-destdir.patch delete mode 100644 xmlada-4.1-gnatflags.patch create mode 100644 xmlada-4.3-destdir.patch create mode 100644 xmlada-4.3-gnatflags.patch rename xmlada-gpr.patch => xmlada-4.3-gpr.patch (53%) diff --git a/.gitignore b/.gitignore index 812bbbe..7d383b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xmlada-gpl-3.2.1-src.tgz /xmlada-gpl-4.1-src.tgz +/xmlada-gpl-4.3-src.tgz diff --git a/sources b/sources index 3dfd44e..4742213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c17ac563b8375bd652a0eb8e141cda59 xmlada-gpl-4.1-src.tgz +764c474e8334b263dc3c2dd95693484d xmlada-gpl-4.3-src.tgz diff --git a/xmlada-4.1-destdir.patch b/xmlada-4.1-destdir.patch deleted file mode 100644 index f501632..0000000 --- a/xmlada-4.1-destdir.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- a/Makefile.in 2011-07-16 11:17:09.335569486 +0400 -+++ b/Makefile.in 2011-07-16 11:19:13.406569528 +0400 -@@ -2,7 +2,7 @@ - ## relocatable - ## static - LIBRARY_TYPE=static -- -+DESTDIR ?= - # Replace with the location for the installation directory - INSTALL=@INSTALL@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ -@@ -114,30 +114,30 @@ - cd ${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force -- @${MKDIR} ${bindir} -- @${MKDIR} ${xmllib} -- @${MKDIR} ${libdir}/gnat/xmlada -- @${MKDIR} ${datadir}/doc/xmlada -- @${MKDIR} ${includedir}/xmlada -- @${MKDIR} ${datadir}/gps/plug-ins/ -+ @${MKDIR} ${DESTDIR}/${bindir} -+ @${MKDIR} ${DESTDIR}/${xmllib} -+ @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada -+ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada -+ @${MKDIR} ${DESTDIR}/${includedir}/xmlada -+ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for either shared or static, depending on - ## $LIBRARY_TYPE - install_library_type: install_dirs ${MODULE_INSTALL} -- ${INSTALL} distrib/xmlada_shared.gpr ${libdir}/gnat -- ${INSTALL} distrib/xmlada.gpr ${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_dom.gpr ${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_sax.gpr ${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_input.gpr ${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_schema.gpr ${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_unicode.gpr ${libdir}/gnat/ -- ${INSTALL} xmlada-config ${bindir} -- -${INSTALL} docs/xml.ps ${datadir}/doc/xmlada 2>/dev/null -- -${INSTALL} docs/xml.pdf ${datadir}/doc/xmlada -- -${INSTALL} docs/xml.html ${datadir}/doc/xmlada -- -${INSTALL} docs/xml.info ${datadir}/doc/xmlada -- ${CHMOD} +x ${bindir}/xmlada-config -- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} -+ -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null -+ -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada -+ -${INSTALL} docs/xml.html ${DESTDIR}/${datadir}/doc/xmlada -+ -${INSTALL} docs/xml.info ${DESTDIR}/${datadir}/doc/xmlada -+ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config -+ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for an explicit target - install_static: ---- a/Makefile.in 2011-07-16 11:21:57.232569582 +0400 -+++ b/Makefile.in 2011-07-16 11:22:12.952569588 +0400 -@@ -1,7 +1,7 @@ - ## The type of library we want to build. Possible values: - ## relocatable - ## static --LIBRARY_TYPE=static -+LIBRARY_TYPE=relocatable - DESTDIR ?= - # Replace with the location for the installation directory - INSTALL=@INSTALL@ ---- a/Makefile.in 2011-07-16 11:27:57.295569704 +0400 -+++ b/Makefile.in 2011-07-16 11:30:25.628569754 +0400 -@@ -91,27 +91,27 @@ - - # Rule for installing the modules - %_inst: force -- ${CP} $*/*.ad[bs] ${includedir}/xmlada -- cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr -- -cd ${xmllib}; ${CHMOD} ugo+w *.ali -- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} -- ${RM} ${libdir}/libxmlada_$** -- ${RM} ${xmllib}libxmlada_$** -+ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada -+ cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr -+ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali -+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} -+ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** -+ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** - ifeq (${LIBRARY_TYPE},static) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} - else - ifeq (${OS},Windows_NT) - ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} - cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} - else -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} - endif - endif -- cd ${xmllib}; ${CHMOD} ugo-w *.ali -+ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} ---- a/Makefile.in 2011-07-16 11:47:49.580570102 +0400 -+++ b/Makefile.in 2011-07-16 11:49:47.465570142 +0400 -@@ -92,7 +92,7 @@ - # Rule for installing the modules - %_inst: force - ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada -- cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr -+ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr - -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali - -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} - ${RM} ${DESTDIR}/${libdir}/libxmlada_$** -@@ -116,7 +116,7 @@ - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} - @${MKDIR} ${DESTDIR}/${xmllib} -- @${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada -+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada - @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada - @${MKDIR} ${DESTDIR}/${includedir}/xmlada - @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ -@@ -124,13 +124,13 @@ - ## Do the installation for either shared or static, depending on - ## $LIBRARY_TYPE - install_library_type: install_dirs ${MODULE_INSTALL} -- ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${libdir}/gnat -- ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${libdir}/gnat/ -- ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${libdir}/gnat/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ - ${INSTALL} xmlada-config ${DESTDIR}/${bindir} - -${INSTALL} docs/xml.ps ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null - -${INSTALL} docs/xml.pdf ${DESTDIR}/${datadir}/doc/xmlada diff --git a/xmlada-4.1-gnatflags.patch b/xmlada-4.1-gnatflags.patch deleted file mode 100644 index 6f1008d..0000000 --- a/xmlada-4.1-gnatflags.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile.in 2011-07-16 12:05:27.728570456 +0400 -+++ b/Makefile.in 2011-07-16 12:06:24.945570476 +0400 -@@ -3,6 +3,7 @@ - ## static - LIBRARY_TYPE=relocatable - DESTDIR ?= -+GNATFLAGS ?= - # Replace with the location for the installation directory - INSTALL=@INSTALL@ - PACKAGE_TARNAME=@PACKAGE_TARNAME@ -@@ -20,7 +21,7 @@ - - # Set a default value (ignored if set in the environment) - PROCESSORS?=1 --GNATMAKE=@gnatmake@ -j${PROCESSORS} -+GNATMAKE=@gnatmake@ ${GNATFLAGS} - - # Compiler mode: one of "distrib", "debug", "optimize", "profile" - MODE=distrib diff --git a/xmlada-4.3-destdir.patch b/xmlada-4.3-destdir.patch new file mode 100644 index 0000000..e3488f9 --- /dev/null +++ b/xmlada-4.3-destdir.patch @@ -0,0 +1,207 @@ +--- a/Makefile.in 2012-12-18 11:49:31.486648187 +0400 ++++ b/Makefile.in 2012-12-18 11:53:34.411498184 +0400 +@@ -1,7 +1,8 @@ + ## The type of library we want to build. Possible values: + ## relocatable + ## static +-LIBRARY_TYPE=static ++LIBRARY_TYPE=relocatable ++DESTDIR ?= + + # Replace with the location for the installation directory + INSTALL=@INSTALL@ +@@ -53,7 +54,7 @@ + + ifeq (${BUILDS_SHARED},yes) + all: static relocatable +-install: install_static install_relocatable ++install: install_relocatable + else + all: static + install: install_static +@@ -114,29 +115,29 @@ + cd ${xmllib}; ${CHMOD} ugo-w *.ali + + install_dirs: force +- @${MKDIR} ${bindir} +- @${MKDIR} ${xmllib} +- @${MKDIR} ${prefix}/lib/gnat/xmlada +- @${MKDIR} ${libdir} +- @${MKDIR} ${datadir}/doc/xmlada +- @${MKDIR} ${includedir}/xmlada +- @${MKDIR} ${datadir}/gps/plug-ins/ ++ @${MKDIR} ${DESTDIR}/${bindir} ++ @${MKDIR} ${DESTDIR}/${xmllib} ++ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada ++ @${MKDIR} ${DESTDIR}/${libdir} ++ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada ++ @${MKDIR} ${DESTDIR}/${includedir}/xmlada ++ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for either shared or static, depending on + ## $LIBRARY_TYPE + install_library_type: install_dirs ${MODULE_INSTALL} +- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/ +- ${INSTALL} xmlada-config ${bindir} +- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null +- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null +- ${CHMOD} +x ${bindir}/xmlada-config +- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH} ++ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} ++ -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null ++ -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null ++ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config ++ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for an explicit target + install_static: +--- a/Makefile.314.in 2012-12-18 11:59:49.344264437 +0400 ++++ b/Makefile.314.in 2012-12-18 12:00:49.167974062 +0400 +@@ -12,14 +12,14 @@ + + all: ${MODULES} + install: install_dirs all +- cd ${PREFIX}/include/xmlada; ${CHMOD} -w *.ali ++ cd ${DESTDIR}/${PREFIX}/include/xmlada; ${CHMOD} -w *.ali + + install_dirs: force +- ${MKDIR} ${PREFIX}/lib +- ${MKDIR} ${PREFIX}/include/xmlada +- ${MKDIR} ${PREFIX}/bin +- ${CP} xmlada-config ${PREFIX}/bin +- ${CHMOD} +x ${PREFIX}/bin/xmlada-config ++ ${MKDIR} ${DESTDIR}/${PREFIX}/lib ++ ${MKDIR} ${DESTDIR}/${PREFIX}/include/xmlada ++ ${MKDIR} ${DESTDIR}/${PREFIX}/bin ++ ${CP} xmlada-config ${DESTDIR}/${PREFIX}/bin ++ ${CHMOD} +x ${DESTDIR}/${PREFIX}/bin/xmlada-config + + ${MODULES}: force + cd $@; ${MAKE} -f ../Makefile.module.314 +--- a/Makefile.module.314 2012-12-18 12:04:43.429701164 +0400 ++++ b/Makefile.module.314 2012-12-18 12:06:05.130548705 +0400 +@@ -17,7 +17,7 @@ + + SRC=${wildcard *.ads} + OBJ=${SRC:%.ads=%.o} +- ++DESTDIR ?= + libname=libxmlada_${MODULE} + soname=libxmlada_${MODULE}-${MAJOR}.${MINOR} + +@@ -37,12 +37,11 @@ + ifeq (${BUILD_SHARED}, TRUE) + cd obj; ${CC} -shared -o ${soname}.so ${OBJ} + endif +- cd obj; ${CP} *.ali ${PREFIX}/include/xmlada +- ${CP} *.ad[bs] ${PREFIX}/include/xmlada +- cd obj; ${CP} ${libname}.a ${PREFIX}/lib ++ cd obj; ${CP} *.ali ${DESTDIR}/${PREFIX}/include/xmlada ++ ${CP} *.ad[bs] ${DESTDIR}/${PREFIX}/include/xmlada + ifeq (${BUILD_SHARED}, TRUE) +- cd obj; ${CP} ${soname}.so ${PREFIX}/lib +- cd ${PREFIX}/lib; ${LN} ${soname}.so ${libname}.so ++ cd obj; ${CP} ${soname}.so ${DESTDIR}/${PREFIX}/lib ++ cd ${PREFIX}/lib; ${LN} ${soname}.so ${DESTDIR}/${libname}.so + endif + + force: +--- a/Makefile.314.in 2012-12-18 12:09:20.138667591 +0400 ++++ b/Makefile.314.in 2012-12-18 12:09:30.408779483 +0400 +@@ -1,7 +1,7 @@ + PREFIX=@prefix@ + BUILD_SHARED=FALSE + RANLIB=@RANLIB@ +- ++DESTDIR ?= + MODULES=unicode input_sources sax dom + MAJOR=0 + MINOR=8 +--- a/Makefile.in 2012-12-18 12:13:04.266473510 +0400 ++++ b/Makefile.in 2012-12-18 12:13:51.672353196 +0400 +@@ -18,6 +18,7 @@ + xmllib=${libdir}/xmlada/${LIBRARY_TYPE}/ + docdir=@docdir@ + includedir=@includedir@ ++ADA_PROJECT_PATH ?= + + # Set a default value (ignored if set in the environment) + PROCESSORS?=1 +--- a/Makefile.in 2012-12-18 12:14:14.828765183 +0400 ++++ b/Makefile.in 2012-12-18 12:16:24.017898234 +0400 +@@ -93,27 +93,27 @@ + + # Rule for installing the modules + %_inst: force +- ${CP} $*/*.ad[bs] ${includedir}/xmlada +- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr +- -cd ${xmllib}; ${CHMOD} ugo+w *.ali +- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} +- ${RM} ${libdir}/libxmlada_$** +- ${RM} ${xmllib}libxmlada_$** ++ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada ++ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr ++ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali ++ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} ++ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** ++ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** + ifeq (${LIBRARY_TYPE},static) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} + else + ifeq (${OS},Windows_NT) + ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} + cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} + else +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} +- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} ++ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} ++ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} + endif + endif +- cd ${xmllib}; ${CHMOD} ugo-w *.ali ++ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali + + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} +--- a/Makefile.in 2012-12-18 13:26:25.078354580 +0400 ++++ b/Makefile.in 2012-12-18 13:26:51.391700047 +0400 +@@ -92,7 +92,7 @@ + -${MAKE} -e -C docs html latexpdf + + # Rule for installing the modules +-%_inst: force ++%_inst: force install_dirs + ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada + cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr + -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali +--- a/Makefile.in 2012-12-18 13:29:37.567920257 +0400 ++++ b/Makefile.in 2012-12-18 13:29:52.727119161 +0400 +@@ -118,7 +118,7 @@ + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} + @${MKDIR} ${DESTDIR}/${xmllib} +- @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada ++ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada + @${MKDIR} ${DESTDIR}/${libdir} + @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada + @${MKDIR} ${DESTDIR}/${includedir}/xmlada diff --git a/xmlada-4.3-gnatflags.patch b/xmlada-4.3-gnatflags.patch new file mode 100644 index 0000000..b53ae40 --- /dev/null +++ b/xmlada-4.3-gnatflags.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in 2012-12-18 13:41:48.220640609 +0400 ++++ b/Makefile.in 2012-12-18 13:42:11.367941179 +0400 +@@ -22,7 +22,8 @@ + + # Set a default value (ignored if set in the environment) + PROCESSORS?=1 +-GNATMAKE=@gnatmake@ -j${PROCESSORS} ++GNATFLAGS ?= ++GNATMAKE=@gnatmake@ ${GNATFLAGS} + + # Compiler mode: one of "distrib", "debug", "optimize", "profile", "coverage" + MODE=distrib diff --git a/xmlada-gpr.patch b/xmlada-4.3-gpr.patch similarity index 53% rename from xmlada-gpr.patch rename to xmlada-4.3-gpr.patch index 74384fe..9c9aca3 100644 --- a/xmlada-gpr.patch +++ b/xmlada-4.3-gpr.patch @@ -1,9 +1,9 @@ ---- a/distrib/xmlada_dom.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada_dom.gpr 2011-03-01 12:17:54.631541017 +0300 -@@ -1,12 +1,13 @@ -+with "directories"; +--- a/distrib/xmlada_dom.gpr 2012-12-18 13:53:16.341334269 +0400 ++++ b/distrib/xmlada_dom.gpr 2012-12-18 13:54:03.003919628 +0400 +@@ -1,12 +1,14 @@ with "xmlada_shared"; with "xmlada_sax"; ++with "directories"; project XmlAda_Dom is for Library_Name use "xmlada_dom"; @@ -11,35 +11,36 @@ - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use "../xmlada/" & Project'Library_Kind; +- for Library_Dir use Xmlada_Shared.Libdir; + for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; ++ for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; ---- a/distrib/xmlada_sax.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada_sax.gpr 2011-03-01 12:17:54.633540891 +0300 -@@ -1,3 +1,4 @@ -+with "directories"; +--- a/distrib/xmlada_sax.gpr 2012-12-18 13:54:41.931409193 +0400 ++++ b/distrib/xmlada_sax.gpr 2012-12-18 13:55:26.489972416 +0400 +@@ -1,13 +1,15 @@ with "xmlada_shared"; with "xmlada_input"; ++with "directories"; with "xmlada_unicode"; -@@ -5,9 +6,9 @@ + project XmlAda_Sax is for Library_Name use "xmlada_sax"; for Library_Kind use Xmlada_Shared.Xmlada_Kind; - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use "../xmlada/" & Project'Library_Kind; + for Library_Dir use Xmlada_Shared.Libdir; + for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; for Externally_Built use "true"; ---- a/distrib/xmlada_input.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada_input.gpr 2011-03-01 12:17:54.632540953 +0300 -@@ -1,12 +1,13 @@ -+with "directories"; +--- a/distrib/xmlada_input.gpr 2012-12-18 13:55:33.300060354 +0400 ++++ b/distrib/xmlada_input.gpr 2012-12-18 13:56:06.452480247 +0400 +@@ -1,10 +1,11 @@ with "xmlada_shared"; ++with "directories"; with "xmlada_unicode"; project XmlAda_Input is for Library_Name use "xmlada_input_sources"; @@ -48,41 +49,55 @@ - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; + for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use - "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; - for Externally_Built use "true"; ---- a/distrib/xmlada.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada.gpr 2011-03-01 12:17:54.632540953 +0300 -@@ -1,3 +1,4 @@ +--- a/distrib/xmlada.gpr 2012-12-18 13:56:18.460632494 +0400 ++++ b/distrib/xmlada.gpr 2012-12-18 13:56:26.696736255 +0400 +@@ -5,6 +5,8 @@ + + with "xmlada_unicode", "xmlada_sax", "xmlada_input", "xmlada_dom"; + with "xmlada_schema"; +with "directories"; - -- Project file for use of XML/Ada. - -- Put the directory that contains xmlada.gpr in your ADA_PROJECT_PATH - -- variable. Then, in our own project file, add a "with" dependency on ---- a/distrib/xmlada_schema.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada_schema.gpr 2011-03-01 12:17:54.633540891 +0300 -@@ -1,12 +1,13 @@ ++ + + project Xmlada is + for Source_Dirs use (); +--- a/distrib/xmlada_shared.gpr.in 2012-12-18 13:56:36.862864254 +0400 ++++ b/distrib/xmlada_shared.gpr.in 2012-12-18 13:57:08.059259105 +0400 +@@ -1,3 +1,5 @@ +with "directories"; ++ + project Xmlada_Shared is + for Source_Dirs use (); + Version := "@PACKAGE_VERSION@"; +@@ -6,5 +8,5 @@ + Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@"); + + -- Location for the dynamic library and ALI files +- Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind; ++ Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind; + end Xmlada_Shared; +--- a/distrib/xmlada_schema.gpr 2012-12-18 13:57:29.490530848 +0400 ++++ b/distrib/xmlada_schema.gpr 2012-12-18 13:57:48.865776522 +0400 +@@ -1,10 +1,11 @@ with "xmlada_shared"; ++with "directories"; with "xmlada_dom"; project XmlAda_Schema is for Library_Name use "xmlada_schema"; for Library_Kind use Xmlada_Shared.Xmlada_Kind; - for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; + for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use - "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; - for Externally_Built use "true"; ---- a/distrib/xmlada_unicode.gpr 2011-03-01 12:18:26.928536602 +0300 -+++ b/distrib/xmlada_unicode.gpr 2011-03-01 12:17:54.633540891 +0300 -@@ -1,11 +1,12 @@ -+with "directories"; +--- a/distrib/xmlada_unicode.gpr 2012-12-18 13:58:00.042917667 +0400 ++++ b/distrib/xmlada_unicode.gpr 2012-12-18 13:58:17.724141757 +0400 +@@ -1,9 +1,11 @@ with "xmlada_shared"; ++with "directories"; ++ project XmlAda_Unicode is for Library_Name use "xmlada_unicode"; @@ -90,8 +105,5 @@ - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use "../xmlada/" & Project'Library_Kind; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; + for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use - "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; - for Externally_Built use "true"; diff --git a/xmlada.spec b/xmlada.spec index 4a7421e..4df10f0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada -Version: 4.1 -Release: 4%{?dist} +Version: 4.3 +Release: 2%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -8,12 +8,12 @@ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ Source0: xmlada-gpl-%{version}-src.tgz +## Fedora-specific +Patch2: %{name}-%{version}-gpr.patch +Patch1: %{name}-%{version}-gnatflags.patch ## Patch for use relocatable libs instead static ## and add DESTDIR option for make install Patch0: %{name}-%{version}-destdir.patch -## Fedora-specific -Patch1: %{name}-gpr.patch -Patch2: %{name}-%{version}-gnatflags.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 @@ -35,7 +35,7 @@ Requires: fedora-gnat-project-common >= 2 Xml library for ada devel package. %prep -%setup -q -n xmlada-4.1-src +%setup -q -n xmlada-%{version}w-src %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -65,9 +65,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %files %defattr(-,root,root,-) -%doc README TODO AUTHORS COPYING +%doc README TODO AUTHORS COPYING* %dir %{_libdir}/%{name} -%dir %{_docdir}/%{name} +%{_docdir}/%{name} %dir %{_libdir}/%{name}/relocatable %dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* @@ -76,9 +76,6 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %{_libdir}/lib%{name}_unicode.so.* %{_libdir}/lib%{name}_sax.so.* %{_libdir}/%{name}/relocatable/lib%{name}*.so.* -%{_docdir}/%{name}/xml.html -%{_docdir}/%{name}/xml.info -%{_docdir}/%{name}/xml.pdf @@ -106,8 +103,11 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog -* Sun Jul 22 2012 Fedora Release Engineering - 4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +* Tue Dec 18 2012 Pavel Zhukov - 4.3-2 +- Fix gpr patch + +* Mon Dec 17 2012 Pavel Zhukov - 4.3-1 +- New release * Tue Jan 10 2012 Pavel Zhukov - 4.1-3 - Rebuild for new GCC-4.7 From f1e4a04d4674b52ae0ab936754a6bb74aed26cfc Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 25 Jan 2013 21:41:46 +0100 Subject: [PATCH 011/137] Rebuild with GCC 4.8 --- xmlada.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 4df10f0..3992ada 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -103,6 +103,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Fri Jan 25 2013 Pavel Zhukov - 4.3-3 +- Rebuild with GCC 4.8 + * Tue Dec 18 2012 Pavel Zhukov - 4.3-2 - Fix gpr patch From 650397576ee484e23c2e4b843b7a4e5fc07b569b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 25 Jan 2013 21:42:49 +0100 Subject: [PATCH 012/137] Increase release number --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 3992ada..519afd0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ From 681d24660328bbed6b2e9a5bfdeb7e165ff433ca Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 25 Jan 2013 22:19:31 -0700 Subject: [PATCH 013/137] Rebuild for new libgnat --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 519afd0..21225a8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -103,6 +103,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Fri Jan 25 2013 Kevin Fenzi 4.3-4 +- Rebuild for new libgnat + * Fri Jan 25 2013 Pavel Zhukov - 4.3-3 - Rebuild with GCC 4.8 From 034d36a8f0456ca1403f2c5ae34f644c2eae4deb Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 9 Mar 2013 21:54:07 +0100 Subject: [PATCH 014/137] Try to fix AWS build --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 21225a8..f7dff19 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -103,6 +103,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sat Mar 09 2013 Pavel Zhukov - 4.3-5 +- Aws failed to bind with xmlada + * Fri Jan 25 2013 Kevin Fenzi 4.3-4 - Rebuild for new libgnat From daf2d1d65e65656f0f32e57c44c69042699df6f0 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 13 Jul 2013 11:17:56 +0200 Subject: [PATCH 015/137] New release (2013) --- .gitignore | 1 + sources | 2 +- xmlada-2013-destdir.patch | 248 ++++++++++++++++++ ...flags.patch => xmlada-2013-gnatflags.patch | 8 +- xmlada-4.3-gpr.patch => xmlada-2013-gpr.patch | 77 +++--- xmlada-4.3-destdir.patch | 207 --------------- xmlada.spec | 17 +- 7 files changed, 301 insertions(+), 259 deletions(-) create mode 100644 xmlada-2013-destdir.patch rename xmlada-4.3-gnatflags.patch => xmlada-2013-gnatflags.patch (57%) rename xmlada-4.3-gpr.patch => xmlada-2013-gpr.patch (61%) delete mode 100644 xmlada-4.3-destdir.patch diff --git a/.gitignore b/.gitignore index 7d383b2..50bc8ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xmlada-gpl-3.2.1-src.tgz /xmlada-gpl-4.1-src.tgz /xmlada-gpl-4.3-src.tgz +/xmlada-gpl-2013-src.tgz diff --git a/sources b/sources index 4742213..f2a9bd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -764c474e8334b263dc3c2dd95693484d xmlada-gpl-4.3-src.tgz +46df8b0190af7e6950f824a55c00fd85 xmlada-gpl-2013-src.tgz diff --git a/xmlada-2013-destdir.patch b/xmlada-2013-destdir.patch new file mode 100644 index 0000000..8bf2c95 --- /dev/null +++ b/xmlada-2013-destdir.patch @@ -0,0 +1,248 @@ +--- a/Makefile.in 2013-07-13 10:05:59.831987250 +0200 ++++ b/Makefile.in 2013-07-13 10:09:09.344981612 +0200 +@@ -1,7 +1,8 @@ + ## The type of library we want to build. Possible values: + ## relocatable + ## static +-LIBRARY_TYPE=static ++LIBRARY_TYPE=relocatable ++DESTDIR ?= + + # Replace with the location for the installation directory + INSTALL=@INSTALL@ +@@ -110,29 +111,29 @@ + cd ${xmllib}; ${CHMOD} ugo-w *.ali + + install_dirs: force +- @${MKDIR} ${bindir} +- @${MKDIR} ${xmllib} +- @${MKDIR} ${prefix}/lib/gnat/xmlada +- @${MKDIR} ${libdir} +- @${MKDIR} ${datadir}/doc/xmlada +- @${MKDIR} ${includedir}/xmlada +- @${MKDIR} ${datadir}/gps/plug-ins/ ++ @${MKDIR} ${DESTDIR}/${bindir} ++ @${MKDIR} ${DESTDIR}/${xmllib} ++ @${MKDIR} ${DESTDIR}/${prefix}/lib/gnat/xmlada ++ @${MKDIR} ${DESTDIR}/${libdir} ++ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada ++ @${MKDIR} ${DESTDIR}/${includedir}/xmlada ++ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for either shared or static, depending on + ## $LIBRARY_TYPE + install_library_type: install_dirs ${MODULE_INSTALL} +- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/ +- ${INSTALL} xmlada-config ${bindir} +- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null +- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null +- ${CHMOD} +x ${bindir}/xmlada-config +- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} ++ -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null ++ -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null ++ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config ++ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ + + ## Do the installation for an explicit target + install_static: +--- a/Makefile.314.in 2013-07-13 10:09:14.277981465 +0200 ++++ b/Makefile.314.in 2013-07-13 10:11:12.683977943 +0200 +@@ -1,3 +1,4 @@ ++DESTDIR ?= + PREFIX=@prefix@ + BUILD_SHARED=FALSE + RANLIB=@RANLIB@ +@@ -15,11 +16,11 @@ + cd ${PREFIX}/include/xmlada; ${CHMOD} -w *.ali + + install_dirs: force +- ${MKDIR} ${PREFIX}/lib +- ${MKDIR} ${PREFIX}/include/xmlada +- ${MKDIR} ${PREFIX}/bin +- ${CP} xmlada-config ${PREFIX}/bin +- ${CHMOD} +x ${PREFIX}/bin/xmlada-config ++ ${MKDIR} ${DESTIR}/${PREFIX}/lib ++ ${MKDIR} ${DESTIR}/${PREFIX}/include/xmlada ++ ${MKDIR} ${DESTIR}/${PREFIX}/bin ++ ${CP} xmlada-config ${DESTIR}/${PREFIX}/bin ++ ${CHMOD} +x ${DESTIR}/${PREFIX}/bin/xmlada-config + + ${MODULES}: force + cd $@; ${MAKE} -f ../Makefile.module.314 +--- a/Makefile.module.314 2013-07-13 10:11:22.609977648 +0200 ++++ b/Makefile.module.314 2013-07-13 10:12:45.990975167 +0200 +@@ -10,6 +10,8 @@ + LN=ln -f -s + + BUILD_SHARED= ++ADA_PROJECT_PATH ?= ++DESTDIR ?= + PREFIX= + MAJOR= + MINOR= +--- a/Makefile.module.314 2013-07-13 10:14:15.854972494 +0200 ++++ b/Makefile.module.314 2013-07-13 10:16:24.197968676 +0200 +@@ -11,6 +11,7 @@ + + BUILD_SHARED= + ADA_PROJECT_PATH ?= ++LIBDIR ?= + DESTDIR ?= + PREFIX= + MAJOR= +@@ -39,12 +40,11 @@ + ifeq (${BUILD_SHARED}, TRUE) + cd obj; ${CC} -shared -o ${soname}.so ${OBJ} + endif +- cd obj; ${CP} *.ali ${PREFIX}/include/xmlada +- ${CP} *.ad[bs] ${PREFIX}/include/xmlada +- cd obj; ${CP} ${libname}.a ${PREFIX}/lib ++ cd obj; ${CP} *.ali ${DESTDIR}/${LIBDIR}/xmlada/ ++ ${CP} *.ad[bs] ${DESTDIR}/${PREFIX}/include/xmlada + ifeq (${BUILD_SHARED}, TRUE) +- cd obj; ${CP} ${soname}.so ${PREFIX}/lib +- cd ${PREFIX}/lib; ${LN} ${soname}.so ${libname}.so ++ cd obj; ${CP} ${soname}.so ${DESTDIR}/${LIBDIR} ++ cd ${DESTDIR}/${LIBDIR}; ${LN} ${soname}.so ${libname}.so + endif + + force: +--- a/Makefile.314.in 2013-07-13 10:19:56.234962369 +0200 ++++ b/Makefile.314.in 2013-07-13 10:20:40.494961052 +0200 +@@ -24,7 +24,7 @@ + + ${MODULES}: force + cd $@; ${MAKE} -f ../Makefile.module.314 +- cd $@; ${MAKE} -f ../Makefile.module.314 MAJOR=${MAJOR} MINOR=${MINOR} PREFIX="${PREFIX}" BUILD_SHARED=${BUILD_SHARED} RANLIB="${RANLIB}" MODULE=$@ lib ++ cd $@; ${MAKE} -f ../Makefile.module.314 MAJOR=${MAJOR} MINOR=${MINOR} DESTDIR="${DESTDIR}" LIBDIR="${LIBDIR}" PREFIX="${PREFIX}" BUILD_SHARED=${BUILD_SHARED} RANLIB="${RANLIB}" MODULE=$@ lib + + clean: force + ${RM} ${MODULES:%=%/obj/*} 2>/dev/null +--- a/Makefile.in 2013-07-13 10:21:58.902958720 +0200 ++++ b/Makefile.in 2013-07-13 10:24:54.798953487 +0200 +@@ -88,27 +88,27 @@ + + # Rule for installing the modules + %_inst: force +- ${CP} $*/*.ad[bs] ${includedir}/xmlada +- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr +- -cd ${xmllib}; ${CHMOD} ugo+w *.ali +- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} ++ ${CP} $*/*.ad[bs] $(DESTDIR)/${includedir}/xmlada ++ cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr ++ -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali ++ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} + ${RM} ${libdir}/libxmlada_$** + ${RM} ${xmllib}libxmlada_$** + ifeq (${LIBRARY_TYPE},static) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a $(DESTDIR)/${xmllib} + else + ifeq (${LIBEXT},.dll) +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} ${xmllib} +- cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} $(DESTDIR)/${xmllib} ++ cd $(DESTDIR)/${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} + else +- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${xmllib} ++ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} $(DESTDIR)/${xmllib} + cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} + -cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} + cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} + -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} + endif + endif +- cd ${xmllib}; ${CHMOD} ugo-w *.ali ++ cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali + + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} +--- a/Makefile.in 2013-07-13 10:30:22.334943744 +0200 ++++ b/Makefile.in 2013-07-13 10:30:49.698942930 +0200 +@@ -92,8 +92,8 @@ + cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr + -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali + -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} +- ${RM} ${libdir}/libxmlada_$** +- ${RM} ${xmllib}libxmlada_$** ++ ${RM} $(DESTDIR)/${libdir}/libxmlada_$** ++ ${RM} $(DESTDIR)/${xmllib}libxmlada_$** + ifeq (${LIBRARY_TYPE},static) + ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a $(DESTDIR)/${xmllib} + else +--- a/Makefile.in 2013-07-13 10:34:51.431935739 +0200 ++++ b/Makefile.in 2013-07-13 10:35:09.178935211 +0200 +@@ -102,10 +102,10 @@ + cd $(DESTDIR)/${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} + else + ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} $(DESTDIR)/${xmllib} +- cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} +- -cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} +- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} +- -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} ++ cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} ++ -cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} ++ cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} ++ -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} + endif + endif + cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali +--- a/Makefile.in 2013-07-13 10:37:32.484930948 +0200 ++++ b/Makefile.in 2013-07-13 10:38:30.873929211 +0200 +@@ -113,7 +113,7 @@ + install_dirs: force + @${MKDIR} ${DESTDIR}/${bindir} + @${MKDIR} ${DESTDIR}/${xmllib} +- @${MKDIR} ${DESTDIR}/${prefix}/lib/gnat/xmlada ++ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada + @${MKDIR} ${DESTDIR}/${libdir} + @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada + @${MKDIR} ${DESTDIR}/${includedir}/xmlada +--- a/Makefile.in 2013-07-13 10:41:58.644923031 +0200 ++++ b/Makefile.in 2013-07-13 10:42:44.785921658 +0200 +@@ -89,7 +89,7 @@ + # Rule for installing the modules + %_inst: force + ${CP} $*/*.ad[bs] $(DESTDIR)/${includedir}/xmlada +- cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr ++ cd $*; ls *.ad[bs] > $(DESTDIR)/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr + -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali + -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} + ${RM} $(DESTDIR)/${libdir}/libxmlada_$** +--- a/Makefile.in 2013-07-13 10:45:14.995917190 +0200 ++++ b/Makefile.in 2013-07-13 10:45:43.935916329 +0200 +@@ -122,13 +122,13 @@ + ## Do the installation for either shared or static, depending on + ## $LIBRARY_TYPE + install_library_type: install_dirs ${MODULE_INSTALL} +- ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${prefix}/lib/gnat/ +- ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${prefix}/lib/gnat/ ++ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ ++ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ + ${INSTALL} xmlada-config ${DESTDIR}/${bindir} + -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null + -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null diff --git a/xmlada-4.3-gnatflags.patch b/xmlada-2013-gnatflags.patch similarity index 57% rename from xmlada-4.3-gnatflags.patch rename to xmlada-2013-gnatflags.patch index b53ae40..652e061 100644 --- a/xmlada-4.3-gnatflags.patch +++ b/xmlada-2013-gnatflags.patch @@ -1,12 +1,12 @@ ---- a/Makefile.in 2012-12-18 13:41:48.220640609 +0400 -+++ b/Makefile.in 2012-12-18 13:42:11.367941179 +0400 -@@ -22,7 +22,8 @@ +--- a/Makefile.in 2013-07-13 11:02:24.357886569 +0200 ++++ b/Makefile.in 2013-07-13 11:03:02.057885447 +0200 +@@ -21,7 +21,8 @@ # Set a default value (ignored if set in the environment) PROCESSORS?=1 -GNATMAKE=@gnatmake@ -j${PROCESSORS} +GNATFLAGS ?= -+GNATMAKE=@gnatmake@ ${GNATFLAGS} ++GNATMAKE=@gnatmake@ ${GNATFLAGS} # Compiler mode: one of "distrib", "debug", "optimize", "profile", "coverage" MODE=distrib diff --git a/xmlada-4.3-gpr.patch b/xmlada-2013-gpr.patch similarity index 61% rename from xmlada-4.3-gpr.patch rename to xmlada-2013-gpr.patch index 9c9aca3..20bdd8a 100644 --- a/xmlada-4.3-gpr.patch +++ b/xmlada-2013-gpr.patch @@ -1,9 +1,9 @@ ---- a/distrib/xmlada_dom.gpr 2012-12-18 13:53:16.341334269 +0400 -+++ b/distrib/xmlada_dom.gpr 2012-12-18 13:54:03.003919628 +0400 -@@ -1,12 +1,14 @@ +--- a/distrib/xmlada_dom.gpr 2013-07-13 11:07:24.831877631 +0200 ++++ b/distrib/xmlada_dom.gpr 2013-07-13 11:08:02.467876511 +0200 +@@ -1,12 +1,13 @@ with "xmlada_shared"; ++with "directories"; with "xmlada_sax"; -+with "directories"; project XmlAda_Dom is for Library_Name use "xmlada_dom"; @@ -13,16 +13,15 @@ for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use Xmlada_Shared.Libdir; + for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; -+ for Library_Version use - "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; - for Externally_Built use "true"; ---- a/distrib/xmlada_sax.gpr 2012-12-18 13:54:41.931409193 +0400 -+++ b/distrib/xmlada_sax.gpr 2012-12-18 13:55:26.489972416 +0400 -@@ -1,13 +1,15 @@ + "lib" & Project'Library_Name + & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version; +--- a/distrib/xmlada_sax.gpr 2013-07-13 11:08:23.201875894 +0200 ++++ b/distrib/xmlada_sax.gpr 2013-07-13 11:08:58.541874843 +0200 +@@ -1,13 +1,14 @@ with "xmlada_shared"; - with "xmlada_input"; +with "directories"; + with "xmlada_input"; with "xmlada_unicode"; project XmlAda_Sax is for Library_Name use "xmlada_sax"; @@ -31,17 +30,18 @@ - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use Xmlada_Shared.Libdir; +- for Library_Dir use Xmlada_Shared.Libdir; + for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use - "lib" & Project'Library_Name & ".so." & Xmlada_Shared.Version; - for Externally_Built use "true"; ---- a/distrib/xmlada_input.gpr 2012-12-18 13:55:33.300060354 +0400 -+++ b/distrib/xmlada_input.gpr 2012-12-18 13:56:06.452480247 +0400 -@@ -1,10 +1,11 @@ + "lib" & Project'Library_Name + & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version; +--- a/distrib/xmlada_input.gpr 2013-07-13 11:11:33.783870225 +0200 ++++ b/distrib/xmlada_input.gpr 2013-07-13 11:12:25.203868695 +0200 +@@ -1,12 +1,14 @@ with "xmlada_shared"; -+with "directories"; with "xmlada_unicode"; ++with "directories"; ++ project XmlAda_Input is for Library_Name use "xmlada_input_sources"; @@ -49,36 +49,30 @@ - for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use Xmlada_Shared.Libdir; +- for Library_Dir use Xmlada_Shared.Libdir; ++ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; for Library_Version use ---- a/distrib/xmlada.gpr 2012-12-18 13:56:18.460632494 +0400 -+++ b/distrib/xmlada.gpr 2012-12-18 13:56:26.696736255 +0400 -@@ -5,6 +5,8 @@ - - with "xmlada_unicode", "xmlada_sax", "xmlada_input", "xmlada_dom"; - with "xmlada_schema"; -+with "directories"; -+ - - project Xmlada is - for Source_Dirs use (); ---- a/distrib/xmlada_shared.gpr.in 2012-12-18 13:56:36.862864254 +0400 -+++ b/distrib/xmlada_shared.gpr.in 2012-12-18 13:57:08.059259105 +0400 + "lib" & Project'Library_Name & Xmlada_Shared.So_Ext + & "." & Xmlada_Shared.Version; +--- a/distrib/xmlada_shared.gpr.in 2013-07-13 11:12:44.145868132 +0200 ++++ b/distrib/xmlada_shared.gpr.in 2013-07-13 11:13:10.165867358 +0200 @@ -1,3 +1,5 @@ +with "directories"; + project Xmlada_Shared is for Source_Dirs use (); Version := "@PACKAGE_VERSION@"; -@@ -6,5 +8,5 @@ +@@ -6,7 +8,7 @@ Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@"); -- Location for the dynamic library and ALI files - Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind; + Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind; + + So_Ext := "@SO_EXT@"; end Xmlada_Shared; ---- a/distrib/xmlada_schema.gpr 2012-12-18 13:57:29.490530848 +0400 -+++ b/distrib/xmlada_schema.gpr 2012-12-18 13:57:48.865776522 +0400 +--- a/distrib/xmlada_schema.gpr 2013-07-13 11:13:18.011867124 +0200 ++++ b/distrib/xmlada_schema.gpr 2013-07-13 11:13:34.310866640 +0200 @@ -1,10 +1,11 @@ with "xmlada_shared"; +with "directories"; @@ -88,13 +82,13 @@ for Library_Kind use Xmlada_Shared.Xmlada_Kind; - for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); ++ for Source_Dirs use (Directories.Includedir & "/xmlada"); for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use ---- a/distrib/xmlada_unicode.gpr 2012-12-18 13:58:00.042917667 +0400 -+++ b/distrib/xmlada_unicode.gpr 2012-12-18 13:58:17.724141757 +0400 -@@ -1,9 +1,11 @@ +--- a/distrib/xmlada_unicode.gpr 2013-07-13 11:13:44.059866350 +0200 ++++ b/distrib/xmlada_unicode.gpr 2013-07-13 11:14:04.463865743 +0200 +@@ -1,10 +1,12 @@ with "xmlada_shared"; +with "directories"; + @@ -102,8 +96,9 @@ for Library_Name use "xmlada_unicode"; for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use ("../../include/xmlada"); +- for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; + for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use + "lib" & Project'Library_Name diff --git a/xmlada-4.3-destdir.patch b/xmlada-4.3-destdir.patch deleted file mode 100644 index e3488f9..0000000 --- a/xmlada-4.3-destdir.patch +++ /dev/null @@ -1,207 +0,0 @@ ---- a/Makefile.in 2012-12-18 11:49:31.486648187 +0400 -+++ b/Makefile.in 2012-12-18 11:53:34.411498184 +0400 -@@ -1,7 +1,8 @@ - ## The type of library we want to build. Possible values: - ## relocatable - ## static --LIBRARY_TYPE=static -+LIBRARY_TYPE=relocatable -+DESTDIR ?= - - # Replace with the location for the installation directory - INSTALL=@INSTALL@ -@@ -53,7 +54,7 @@ - - ifeq (${BUILDS_SHARED},yes) - all: static relocatable --install: install_static install_relocatable -+install: install_relocatable - else - all: static - install: install_static -@@ -114,29 +115,29 @@ - cd ${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force -- @${MKDIR} ${bindir} -- @${MKDIR} ${xmllib} -- @${MKDIR} ${prefix}/lib/gnat/xmlada -- @${MKDIR} ${libdir} -- @${MKDIR} ${datadir}/doc/xmlada -- @${MKDIR} ${includedir}/xmlada -- @${MKDIR} ${datadir}/gps/plug-ins/ -+ @${MKDIR} ${DESTDIR}/${bindir} -+ @${MKDIR} ${DESTDIR}/${xmllib} -+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada -+ @${MKDIR} ${DESTDIR}/${libdir} -+ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada -+ @${MKDIR} ${DESTDIR}/${includedir}/xmlada -+ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for either shared or static, depending on - ## $LIBRARY_TYPE - install_library_type: install_dirs ${MODULE_INSTALL} -- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/ -- ${INSTALL} xmlada-config ${bindir} -- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null -- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null -- ${CHMOD} +x ${bindir}/xmlada-config -- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH} -+ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} -+ -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -+ -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -+ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config -+ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for an explicit target - install_static: ---- a/Makefile.314.in 2012-12-18 11:59:49.344264437 +0400 -+++ b/Makefile.314.in 2012-12-18 12:00:49.167974062 +0400 -@@ -12,14 +12,14 @@ - - all: ${MODULES} - install: install_dirs all -- cd ${PREFIX}/include/xmlada; ${CHMOD} -w *.ali -+ cd ${DESTDIR}/${PREFIX}/include/xmlada; ${CHMOD} -w *.ali - - install_dirs: force -- ${MKDIR} ${PREFIX}/lib -- ${MKDIR} ${PREFIX}/include/xmlada -- ${MKDIR} ${PREFIX}/bin -- ${CP} xmlada-config ${PREFIX}/bin -- ${CHMOD} +x ${PREFIX}/bin/xmlada-config -+ ${MKDIR} ${DESTDIR}/${PREFIX}/lib -+ ${MKDIR} ${DESTDIR}/${PREFIX}/include/xmlada -+ ${MKDIR} ${DESTDIR}/${PREFIX}/bin -+ ${CP} xmlada-config ${DESTDIR}/${PREFIX}/bin -+ ${CHMOD} +x ${DESTDIR}/${PREFIX}/bin/xmlada-config - - ${MODULES}: force - cd $@; ${MAKE} -f ../Makefile.module.314 ---- a/Makefile.module.314 2012-12-18 12:04:43.429701164 +0400 -+++ b/Makefile.module.314 2012-12-18 12:06:05.130548705 +0400 -@@ -17,7 +17,7 @@ - - SRC=${wildcard *.ads} - OBJ=${SRC:%.ads=%.o} -- -+DESTDIR ?= - libname=libxmlada_${MODULE} - soname=libxmlada_${MODULE}-${MAJOR}.${MINOR} - -@@ -37,12 +37,11 @@ - ifeq (${BUILD_SHARED}, TRUE) - cd obj; ${CC} -shared -o ${soname}.so ${OBJ} - endif -- cd obj; ${CP} *.ali ${PREFIX}/include/xmlada -- ${CP} *.ad[bs] ${PREFIX}/include/xmlada -- cd obj; ${CP} ${libname}.a ${PREFIX}/lib -+ cd obj; ${CP} *.ali ${DESTDIR}/${PREFIX}/include/xmlada -+ ${CP} *.ad[bs] ${DESTDIR}/${PREFIX}/include/xmlada - ifeq (${BUILD_SHARED}, TRUE) -- cd obj; ${CP} ${soname}.so ${PREFIX}/lib -- cd ${PREFIX}/lib; ${LN} ${soname}.so ${libname}.so -+ cd obj; ${CP} ${soname}.so ${DESTDIR}/${PREFIX}/lib -+ cd ${PREFIX}/lib; ${LN} ${soname}.so ${DESTDIR}/${libname}.so - endif - - force: ---- a/Makefile.314.in 2012-12-18 12:09:20.138667591 +0400 -+++ b/Makefile.314.in 2012-12-18 12:09:30.408779483 +0400 -@@ -1,7 +1,7 @@ - PREFIX=@prefix@ - BUILD_SHARED=FALSE - RANLIB=@RANLIB@ -- -+DESTDIR ?= - MODULES=unicode input_sources sax dom - MAJOR=0 - MINOR=8 ---- a/Makefile.in 2012-12-18 12:13:04.266473510 +0400 -+++ b/Makefile.in 2012-12-18 12:13:51.672353196 +0400 -@@ -18,6 +18,7 @@ - xmllib=${libdir}/xmlada/${LIBRARY_TYPE}/ - docdir=@docdir@ - includedir=@includedir@ -+ADA_PROJECT_PATH ?= - - # Set a default value (ignored if set in the environment) - PROCESSORS?=1 ---- a/Makefile.in 2012-12-18 12:14:14.828765183 +0400 -+++ b/Makefile.in 2012-12-18 12:16:24.017898234 +0400 -@@ -93,27 +93,27 @@ - - # Rule for installing the modules - %_inst: force -- ${CP} $*/*.ad[bs] ${includedir}/xmlada -- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr -- -cd ${xmllib}; ${CHMOD} ugo+w *.ali -- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} -- ${RM} ${libdir}/libxmlada_$** -- ${RM} ${xmllib}libxmlada_$** -+ ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada -+ cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr -+ -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali -+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${DESTDIR}/${xmllib} -+ ${RM} ${DESTDIR}/${libdir}/libxmlada_$** -+ ${RM} ${DESTDIR}/${xmllib}libxmlada_$** - ifeq (${LIBRARY_TYPE},static) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib} - else - ifeq (${OS},Windows_NT) - ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib} - cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT} - else -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -- cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT} -+ cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}} -+ cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION} - endif - endif -- cd ${xmllib}; ${CHMOD} ugo-w *.ali -+ cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} ---- a/Makefile.in 2012-12-18 13:26:25.078354580 +0400 -+++ b/Makefile.in 2012-12-18 13:26:51.391700047 +0400 -@@ -92,7 +92,7 @@ - -${MAKE} -e -C docs html latexpdf - - # Rule for installing the modules --%_inst: force -+%_inst: force install_dirs - ${CP} $*/*.ad[bs] ${DESTDIR}/${includedir}/xmlada - cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr - -cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali ---- a/Makefile.in 2012-12-18 13:29:37.567920257 +0400 -+++ b/Makefile.in 2012-12-18 13:29:52.727119161 +0400 -@@ -118,7 +118,7 @@ - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} - @${MKDIR} ${DESTDIR}/${xmllib} -- @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}xmlada -+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada - @${MKDIR} ${DESTDIR}/${libdir} - @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada - @${MKDIR} ${DESTDIR}/${includedir}/xmlada diff --git a/xmlada.spec b/xmlada.spec index f7dff19..41a0d3e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,13 +1,14 @@ Name: xmlada -Version: 4.3 -Release: 5%{?dist} +Version: 2013 +Release: 1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-%{version}-src.tgz +Source0: xmlada-gpl-2013-src.tgz +#Source0: xmlada-gpl-%{version}-src.tgz ## Fedora-specific Patch2: %{name}-%{version}-gpr.patch Patch1: %{name}-%{version}-gnatflags.patch @@ -35,20 +36,20 @@ Requires: fedora-gnat-project-common >= 2 Xml library for ada devel package. %prep -%setup -q -n xmlada-%{version}w-src +%setup -q -n xmlada-gpl-%{version}-src %patch0 -p1 %patch1 -p1 %patch2 -p1 %build %configure --disable-rpath --enable-shared --disable-static -make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir +make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes %install rm -rf %{buildroot} export BUILDS_SHARED=yes -make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes +make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes LIBDIR=%{_libdir} ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; @@ -103,6 +104,10 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sat Jul 13 2013 Pavel ZHukov - 2013-1 +- New release +- AdaCore has moved to years in version. + * Sat Mar 09 2013 Pavel Zhukov - 4.3-5 - Aws failed to bind with xmlada From 6e85f6a66093f200f028ffbace35b1c659917feb Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 13 Jul 2013 11:48:28 +0200 Subject: [PATCH 016/137] Fix gpr mistake --- xmlada-2013-gpr.patch | 12 ++++++++++++ xmlada.spec | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/xmlada-2013-gpr.patch b/xmlada-2013-gpr.patch index 20bdd8a..9118a56 100644 --- a/xmlada-2013-gpr.patch +++ b/xmlada-2013-gpr.patch @@ -102,3 +102,15 @@ for Library_Dir use Xmlada_Shared.Libdir; for Library_Version use "lib" & Project'Library_Name +--- a/distrib/xmlada_unicode.gpr 2013-07-13 11:46:19.044808194 +0200 ++++ b/distrib/xmlada_unicode.gpr 2013-07-13 11:46:47.855807337 +0200 +@@ -5,8 +5,8 @@ + for Library_Name use "xmlada_unicode"; + + for Library_Kind use Xmlada_Shared.Xmlada_Kind; +- for Source_Dirs use ("../../include/xmlada"); + for Source_Dirs use (Directories.Includedir & "/xmlada"); ++ for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; + for Library_Dir use Xmlada_Shared.Libdir; + for Library_Version use + "lib" & Project'Library_Name diff --git a/xmlada.spec b/xmlada.spec index 41a0d3e..100ccec 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -104,9 +104,10 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog -* Sat Jul 13 2013 Pavel ZHukov - 2013-1 +* Sat Jul 13 2013 Pavel ZHukov - 2013-2 - New release - AdaCore has moved to years in version. +- Fix gpr error * Sat Mar 09 2013 Pavel Zhukov - 4.3-5 - Aws failed to bind with xmlada From ddcd42f40b89255509978b99a6cf02231e661a72 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:28:46 -0500 Subject: [PATCH 017/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 100ccec..f2e6f32 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -104,6 +104,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2013-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat Jul 13 2013 Pavel ZHukov - 2013-2 - New release - AdaCore has moved to years in version. From d05963e1370e0c274a6ca495ad53d4e4d60139cf Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 3 Sep 2013 23:37:08 +0200 Subject: [PATCH 018/137] Add ExclusiveArch tag (#993146) --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 100ccec..6362fcd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -18,6 +18,9 @@ Patch0: %{name}-%{version}-destdir.patch BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 +# xmlada and gcc-gnat only available on these: +ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha + %description XML/Ada includes support for parsing XML files, including DTDs, From 3bc32b747dd0ead458de225fd00b4649199334d5 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 20 Apr 2014 16:42:49 +0000 Subject: [PATCH 019/137] Rebuild with gcc-4.9 --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index e947711..4d357ac 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sat Jul 13 2013 Pavel Zhukov - 2013-4 +- Rebuild for new gcc + * Sun Aug 04 2013 Fedora Release Engineering - 2013-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d11c89cd19a137f1ac8baa7eaeb6c1667bdb0f55 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 20 Apr 2014 16:44:55 +0000 Subject: [PATCH 020/137] Fix date mistake --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 4d357ac..a8a9c41 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -107,7 +107,7 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog -* Sat Jul 13 2013 Pavel Zhukov - 2013-4 +* Sun Apr 20 2014 Pavel Zhukov - 2013-4 - Rebuild for new gcc * Sun Aug 04 2013 Fedora Release Engineering - 2013-3 From cfb67a32d4b7c3806045c1654c2e8b8aefe61323 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 13 May 2014 11:21:01 +0100 Subject: [PATCH 021/137] aarch64 now has Ada --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index a8a9c41..e252fa4 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -19,7 +19,7 @@ BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: -ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha +ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha aarch64 %description @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Tue May 13 2014 Peter Robinson 2013-5 +- aarch64 now has Ada + * Sun Apr 20 2014 Pavel Zhukov - 2013-4 - Rebuild for new gcc From f78f125fc775041a600b89bc951f592aed6b36eb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 13 May 2014 11:27:28 +0100 Subject: [PATCH 022/137] Use GNAT_arches rather than an explicit list --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index e252fa4..3441ac2 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -19,7 +19,7 @@ BuildRequires: chrpath BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: -ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha aarch64 +ExclusiveArch: %{GNAT_arches} %description @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Tue May 13 2014 Peter Robinson 2013-6 +- Use GNAT_arches rather than an explicit list + * Tue May 13 2014 Peter Robinson 2013-5 - aarch64 now has Ada From d6844c26763284a61d4c29a1139d32a8308c277f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:05:01 -0500 Subject: [PATCH 023/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 3441ac2..492297c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2013-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 13 2014 Peter Robinson 2013-6 - Use GNAT_arches rather than an explicit list From 61e73ffb22dd2ffae3f50d8083d03c186d60d356 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:13:34 +0000 Subject: [PATCH 024/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 492297c..1544da0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2013-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2013-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 5772bfe959774d4b75620685f4fbd5ae33ec2817 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 14 Feb 2015 19:24:13 +0100 Subject: [PATCH 025/137] Rebuild with new gcc 4.9 --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 1544da0..0ee1674 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Sat Feb 14 2015 Pavel Zhukov - 2013-9 +- Rebuild with new gcc 4.9 + * Mon Aug 18 2014 Fedora Release Engineering - 2013-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 157c2eff07b12d6dc40397a6d537e55e20f77f03 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 15 Mar 2015 20:02:21 +0100 Subject: [PATCH 026/137] Create unversioned libraries --- xmlada-2013-destdir.patch | 13 +++++++++++++ xmlada.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/xmlada-2013-destdir.patch b/xmlada-2013-destdir.patch index 8bf2c95..7d2487d 100644 --- a/xmlada-2013-destdir.patch +++ b/xmlada-2013-destdir.patch @@ -246,3 +246,16 @@ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null +diff --git a/Makefile.in b/Makefile.in +index 97a9b46..85cc3fc 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -106,7 +106,7 @@ else + cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} + -cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} + cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} +- -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} ++ -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} + endif + endif + cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali diff --git a/xmlada.spec b/xmlada.spec index 0ee1674..97b334f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -103,10 +103,14 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %{_includedir}/%{name}/*.ads %{_libdir}/%{name}/relocatable/*.ali %{_libdir}/%{name}/relocatable/lib%{name}*.so +%{_libdir}/lib%{name}*.so %changelog +* Sun Mar 15 2015 Pavel Zhukov - 2013-10 +- Create unversioned symlinks + * Sat Feb 14 2015 Pavel Zhukov - 2013-9 - Rebuild with new gcc 4.9 From 19eed92080772958422b45e420f2862146f268aa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 29 Apr 2015 13:24:40 +0100 Subject: [PATCH 027/137] Rebuild for gcc5/gnat5 --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 0ee1674..e14e9e3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -107,6 +107,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Wed Apr 29 2015 Peter Robinson 2013-10 +- rebuild (gcc / gnat 5) + * Sat Feb 14 2015 Pavel Zhukov - 2013-9 - Rebuild with new gcc 4.9 From 469154cb333f6fce44b0a267a172d5d1ce379718 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:08:08 +0000 Subject: [PATCH 028/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 33b876b..e75dfb5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2013 -Release: 11%{?dist} +Release: 12%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -108,6 +108,9 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2013-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Apr 29 2015 Peter Robinson 2013-11 - rebuild (gcc / gnat 5) From 38b1fd401c5c4aa9517a58bd965449f4b2a0bdc1 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 23 Jun 2015 06:19:19 +0000 Subject: [PATCH 029/137] New release (#2015) --- .gitignore | 1 + sources | 2 +- xmlada-2013-destdir.patch | 261 ------------------------------- xmlada-2013-gnatflags.patch | 12 -- xmlada-2013-gpr.patch | 116 -------------- xmlada-2015-disable_static.patch | 58 +++++++ xmlada.spec | 95 ++--------- 7 files changed, 77 insertions(+), 468 deletions(-) delete mode 100644 xmlada-2013-destdir.patch delete mode 100644 xmlada-2013-gnatflags.patch delete mode 100644 xmlada-2013-gpr.patch create mode 100644 xmlada-2015-disable_static.patch diff --git a/.gitignore b/.gitignore index 50bc8ce..d6bd190 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xmlada-gpl-4.1-src.tgz /xmlada-gpl-4.3-src.tgz /xmlada-gpl-2013-src.tgz +/xmlada-gpl-2015-src.tar.gz diff --git a/sources b/sources index f2a9bd9..bd452ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46df8b0190af7e6950f824a55c00fd85 xmlada-gpl-2013-src.tgz +98c96b8c6a877617ec4da3ef6a03288a xmlada-gpl-2015-src.tar.gz diff --git a/xmlada-2013-destdir.patch b/xmlada-2013-destdir.patch deleted file mode 100644 index 7d2487d..0000000 --- a/xmlada-2013-destdir.patch +++ /dev/null @@ -1,261 +0,0 @@ ---- a/Makefile.in 2013-07-13 10:05:59.831987250 +0200 -+++ b/Makefile.in 2013-07-13 10:09:09.344981612 +0200 -@@ -1,7 +1,8 @@ - ## The type of library we want to build. Possible values: - ## relocatable - ## static --LIBRARY_TYPE=static -+LIBRARY_TYPE=relocatable -+DESTDIR ?= - - # Replace with the location for the installation directory - INSTALL=@INSTALL@ -@@ -110,29 +111,29 @@ - cd ${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force -- @${MKDIR} ${bindir} -- @${MKDIR} ${xmllib} -- @${MKDIR} ${prefix}/lib/gnat/xmlada -- @${MKDIR} ${libdir} -- @${MKDIR} ${datadir}/doc/xmlada -- @${MKDIR} ${includedir}/xmlada -- @${MKDIR} ${datadir}/gps/plug-ins/ -+ @${MKDIR} ${DESTDIR}/${bindir} -+ @${MKDIR} ${DESTDIR}/${xmllib} -+ @${MKDIR} ${DESTDIR}/${prefix}/lib/gnat/xmlada -+ @${MKDIR} ${DESTDIR}/${libdir} -+ @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada -+ @${MKDIR} ${DESTDIR}/${includedir}/xmlada -+ @${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for either shared or static, depending on - ## $LIBRARY_TYPE - install_library_type: install_dirs ${MODULE_INSTALL} -- ${INSTALL} distrib/xmlada_shared.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_dom.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_sax.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_input.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_schema.gpr ${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_unicode.gpr ${prefix}/lib/gnat/ -- ${INSTALL} xmlada-config ${bindir} -- -$(CP) -r docs/_build/html/* $(datadir)/doc/xmlada/ 2>/dev/null -- -$(CP) -r docs/_build/latex/XMLAda.pdf $(datadir)/doc/xmlada/ 2>/dev/null -- ${CHMOD} +x ${bindir}/xmlada-config -- ${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} xmlada-config ${DESTDIR}/${bindir} -+ -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -+ -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -+ ${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config -+ ${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/ - - ## Do the installation for an explicit target - install_static: ---- a/Makefile.314.in 2013-07-13 10:09:14.277981465 +0200 -+++ b/Makefile.314.in 2013-07-13 10:11:12.683977943 +0200 -@@ -1,3 +1,4 @@ -+DESTDIR ?= - PREFIX=@prefix@ - BUILD_SHARED=FALSE - RANLIB=@RANLIB@ -@@ -15,11 +16,11 @@ - cd ${PREFIX}/include/xmlada; ${CHMOD} -w *.ali - - install_dirs: force -- ${MKDIR} ${PREFIX}/lib -- ${MKDIR} ${PREFIX}/include/xmlada -- ${MKDIR} ${PREFIX}/bin -- ${CP} xmlada-config ${PREFIX}/bin -- ${CHMOD} +x ${PREFIX}/bin/xmlada-config -+ ${MKDIR} ${DESTIR}/${PREFIX}/lib -+ ${MKDIR} ${DESTIR}/${PREFIX}/include/xmlada -+ ${MKDIR} ${DESTIR}/${PREFIX}/bin -+ ${CP} xmlada-config ${DESTIR}/${PREFIX}/bin -+ ${CHMOD} +x ${DESTIR}/${PREFIX}/bin/xmlada-config - - ${MODULES}: force - cd $@; ${MAKE} -f ../Makefile.module.314 ---- a/Makefile.module.314 2013-07-13 10:11:22.609977648 +0200 -+++ b/Makefile.module.314 2013-07-13 10:12:45.990975167 +0200 -@@ -10,6 +10,8 @@ - LN=ln -f -s - - BUILD_SHARED= -+ADA_PROJECT_PATH ?= -+DESTDIR ?= - PREFIX= - MAJOR= - MINOR= ---- a/Makefile.module.314 2013-07-13 10:14:15.854972494 +0200 -+++ b/Makefile.module.314 2013-07-13 10:16:24.197968676 +0200 -@@ -11,6 +11,7 @@ - - BUILD_SHARED= - ADA_PROJECT_PATH ?= -+LIBDIR ?= - DESTDIR ?= - PREFIX= - MAJOR= -@@ -39,12 +40,11 @@ - ifeq (${BUILD_SHARED}, TRUE) - cd obj; ${CC} -shared -o ${soname}.so ${OBJ} - endif -- cd obj; ${CP} *.ali ${PREFIX}/include/xmlada -- ${CP} *.ad[bs] ${PREFIX}/include/xmlada -- cd obj; ${CP} ${libname}.a ${PREFIX}/lib -+ cd obj; ${CP} *.ali ${DESTDIR}/${LIBDIR}/xmlada/ -+ ${CP} *.ad[bs] ${DESTDIR}/${PREFIX}/include/xmlada - ifeq (${BUILD_SHARED}, TRUE) -- cd obj; ${CP} ${soname}.so ${PREFIX}/lib -- cd ${PREFIX}/lib; ${LN} ${soname}.so ${libname}.so -+ cd obj; ${CP} ${soname}.so ${DESTDIR}/${LIBDIR} -+ cd ${DESTDIR}/${LIBDIR}; ${LN} ${soname}.so ${libname}.so - endif - - force: ---- a/Makefile.314.in 2013-07-13 10:19:56.234962369 +0200 -+++ b/Makefile.314.in 2013-07-13 10:20:40.494961052 +0200 -@@ -24,7 +24,7 @@ - - ${MODULES}: force - cd $@; ${MAKE} -f ../Makefile.module.314 -- cd $@; ${MAKE} -f ../Makefile.module.314 MAJOR=${MAJOR} MINOR=${MINOR} PREFIX="${PREFIX}" BUILD_SHARED=${BUILD_SHARED} RANLIB="${RANLIB}" MODULE=$@ lib -+ cd $@; ${MAKE} -f ../Makefile.module.314 MAJOR=${MAJOR} MINOR=${MINOR} DESTDIR="${DESTDIR}" LIBDIR="${LIBDIR}" PREFIX="${PREFIX}" BUILD_SHARED=${BUILD_SHARED} RANLIB="${RANLIB}" MODULE=$@ lib - - clean: force - ${RM} ${MODULES:%=%/obj/*} 2>/dev/null ---- a/Makefile.in 2013-07-13 10:21:58.902958720 +0200 -+++ b/Makefile.in 2013-07-13 10:24:54.798953487 +0200 -@@ -88,27 +88,27 @@ - - # Rule for installing the modules - %_inst: force -- ${CP} $*/*.ad[bs] ${includedir}/xmlada -- cd $*; ls *.ad[bs] > ${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr -- -cd ${xmllib}; ${CHMOD} ugo+w *.ali -- -${CP} $*/lib/${LIBRARY_TYPE}/*.ali ${xmllib} -+ ${CP} $*/*.ad[bs] $(DESTDIR)/${includedir}/xmlada -+ cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr -+ -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali -+ -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} - ${RM} ${libdir}/libxmlada_$** - ${RM} ${xmllib}libxmlada_$** - ifeq (${LIBRARY_TYPE},static) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a $(DESTDIR)/${xmllib} - else - ifeq (${LIBEXT},.dll) -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} ${xmllib} -- cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} $(DESTDIR)/${xmllib} -+ cd $(DESTDIR)/${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} - else -- ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} ${xmllib} -+ ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} $(DESTDIR)/${xmllib} - cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} - -cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} - cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} - -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} - endif - endif -- cd ${xmllib}; ${CHMOD} ugo-w *.ali -+ cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali - - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} ---- a/Makefile.in 2013-07-13 10:30:22.334943744 +0200 -+++ b/Makefile.in 2013-07-13 10:30:49.698942930 +0200 -@@ -92,8 +92,8 @@ - cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr - -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali - -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} -- ${RM} ${libdir}/libxmlada_$** -- ${RM} ${xmllib}libxmlada_$** -+ ${RM} $(DESTDIR)/${libdir}/libxmlada_$** -+ ${RM} $(DESTDIR)/${xmllib}libxmlada_$** - ifeq (${LIBRARY_TYPE},static) - ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a $(DESTDIR)/${xmllib} - else ---- a/Makefile.in 2013-07-13 10:34:51.431935739 +0200 -+++ b/Makefile.in 2013-07-13 10:35:09.178935211 +0200 -@@ -102,10 +102,10 @@ - cd $(DESTDIR)/${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT} libxmlada_$*${LIBEXT} - else - ${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} $(DESTDIR)/${xmllib} -- cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} -- -cd ${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} -- cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} -- -cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} -+ cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} -+ -cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} -+ cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} -+ -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} - endif - endif - cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali ---- a/Makefile.in 2013-07-13 10:37:32.484930948 +0200 -+++ b/Makefile.in 2013-07-13 10:38:30.873929211 +0200 -@@ -113,7 +113,7 @@ - install_dirs: force - @${MKDIR} ${DESTDIR}/${bindir} - @${MKDIR} ${DESTDIR}/${xmllib} -- @${MKDIR} ${DESTDIR}/${prefix}/lib/gnat/xmlada -+ @${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada - @${MKDIR} ${DESTDIR}/${libdir} - @${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada - @${MKDIR} ${DESTDIR}/${includedir}/xmlada ---- a/Makefile.in 2013-07-13 10:41:58.644923031 +0200 -+++ b/Makefile.in 2013-07-13 10:42:44.785921658 +0200 -@@ -89,7 +89,7 @@ - # Rule for installing the modules - %_inst: force - ${CP} $*/*.ad[bs] $(DESTDIR)/${includedir}/xmlada -- cd $*; ls *.ad[bs] > $(DESTDIR)/${prefix}/lib/gnat/xmlada/xmlada_$*.lgpr -+ cd $*; ls *.ad[bs] > $(DESTDIR)/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr - -cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo+w *.ali - -${CP} $*/lib/${LIBRARY_TYPE}/*.ali $(DESTDIR)/${xmllib} - ${RM} $(DESTDIR)/${libdir}/libxmlada_$** ---- a/Makefile.in 2013-07-13 10:45:14.995917190 +0200 -+++ b/Makefile.in 2013-07-13 10:45:43.935916329 +0200 -@@ -122,13 +122,13 @@ - ## Do the installation for either shared or static, depending on - ## $LIBRARY_TYPE - install_library_type: install_dirs ${MODULE_INSTALL} -- ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${prefix}/lib/gnat/ -- ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${prefix}/lib/gnat/ -+ ${INSTALL} distrib/xmlada_shared.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_dom.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_sax.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_input.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_schema.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ -+ ${INSTALL} distrib/xmlada_unicode.gpr ${DESTDIR}/${ADA_PROJECT_PATH}/ - ${INSTALL} xmlada-config ${DESTDIR}/${bindir} - -$(CP) -r docs/_build/html/* ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null - -$(CP) -r docs/_build/latex/XMLAda.pdf ${DESTDIR}/$(datadir)/doc/xmlada/ 2>/dev/null -diff --git a/Makefile.in b/Makefile.in -index 97a9b46..85cc3fc 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -106,7 +106,7 @@ else - cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} - -cd $(DESTDIR)/${xmllib}; ${LN_S} libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} - cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${VERSION} -- -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT}.${basename ${VERSION}} -+ -cd $(DESTDIR)/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*${LIBEXT}.${VERSION} libxmlada_$*${LIBEXT} - endif - endif - cd $(DESTDIR)/${xmllib}; ${CHMOD} ugo-w *.ali diff --git a/xmlada-2013-gnatflags.patch b/xmlada-2013-gnatflags.patch deleted file mode 100644 index 652e061..0000000 --- a/xmlada-2013-gnatflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in 2013-07-13 11:02:24.357886569 +0200 -+++ b/Makefile.in 2013-07-13 11:03:02.057885447 +0200 -@@ -21,7 +21,8 @@ - - # Set a default value (ignored if set in the environment) - PROCESSORS?=1 --GNATMAKE=@gnatmake@ -j${PROCESSORS} -+GNATFLAGS ?= -+GNATMAKE=@gnatmake@ ${GNATFLAGS} - - # Compiler mode: one of "distrib", "debug", "optimize", "profile", "coverage" - MODE=distrib diff --git a/xmlada-2013-gpr.patch b/xmlada-2013-gpr.patch deleted file mode 100644 index 9118a56..0000000 --- a/xmlada-2013-gpr.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/distrib/xmlada_dom.gpr 2013-07-13 11:07:24.831877631 +0200 -+++ b/distrib/xmlada_dom.gpr 2013-07-13 11:08:02.467876511 +0200 -@@ -1,12 +1,13 @@ - with "xmlada_shared"; -+with "directories"; - with "xmlada_sax"; - project XmlAda_Dom is - for Library_Name use "xmlada_dom"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use Xmlada_Shared.Libdir; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; - for Library_Version use - "lib" & Project'Library_Name - & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version; ---- a/distrib/xmlada_sax.gpr 2013-07-13 11:08:23.201875894 +0200 -+++ b/distrib/xmlada_sax.gpr 2013-07-13 11:08:58.541874843 +0200 -@@ -1,13 +1,14 @@ - with "xmlada_shared"; -+with "directories"; - with "xmlada_input"; - with "xmlada_unicode"; - project XmlAda_Sax is - for Library_Name use "xmlada_sax"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use Xmlada_Shared.Libdir; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; - for Library_Version use - "lib" & Project'Library_Name - & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version; ---- a/distrib/xmlada_input.gpr 2013-07-13 11:11:33.783870225 +0200 -+++ b/distrib/xmlada_input.gpr 2013-07-13 11:12:25.203868695 +0200 -@@ -1,12 +1,14 @@ - with "xmlada_shared"; - with "xmlada_unicode"; -+with "directories"; -+ - project XmlAda_Input is - for Library_Name use "xmlada_input_sources"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -- for Library_Dir use Xmlada_Shared.Libdir; -+ for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind; - for Library_Version use - "lib" & Project'Library_Name & Xmlada_Shared.So_Ext - & "." & Xmlada_Shared.Version; ---- a/distrib/xmlada_shared.gpr.in 2013-07-13 11:12:44.145868132 +0200 -+++ b/distrib/xmlada_shared.gpr.in 2013-07-13 11:13:10.165867358 +0200 -@@ -1,3 +1,5 @@ -+with "directories"; -+ - project Xmlada_Shared is - for Source_Dirs use (); - Version := "@PACKAGE_VERSION@"; -@@ -6,7 +8,7 @@ - Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@"); - - -- Location for the dynamic library and ALI files -- Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind; -+ Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind; - - So_Ext := "@SO_EXT@"; - end Xmlada_Shared; ---- a/distrib/xmlada_schema.gpr 2013-07-13 11:13:18.011867124 +0200 -+++ b/distrib/xmlada_schema.gpr 2013-07-13 11:13:34.310866640 +0200 -@@ -1,10 +1,11 @@ - with "xmlada_shared"; -+with "directories"; - with "xmlada_dom"; - project XmlAda_Schema is - for Library_Name use "xmlada_schema"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use Xmlada_Shared.Libdir; - for Library_Version use ---- a/distrib/xmlada_unicode.gpr 2013-07-13 11:13:44.059866350 +0200 -+++ b/distrib/xmlada_unicode.gpr 2013-07-13 11:14:04.463865743 +0200 -@@ -1,10 +1,12 @@ - with "xmlada_shared"; -+with "directories"; -+ - project XmlAda_Unicode is - for Library_Name use "xmlada_unicode"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; - for Source_Dirs use ("../../include/xmlada"); -- for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; -+ for Source_Dirs use (Directories.Includedir & "/xmlada"); - for Library_Dir use Xmlada_Shared.Libdir; - for Library_Version use - "lib" & Project'Library_Name ---- a/distrib/xmlada_unicode.gpr 2013-07-13 11:46:19.044808194 +0200 -+++ b/distrib/xmlada_unicode.gpr 2013-07-13 11:46:47.855807337 +0200 -@@ -5,8 +5,8 @@ - for Library_Name use "xmlada_unicode"; - - for Library_Kind use Xmlada_Shared.Xmlada_Kind; -- for Source_Dirs use ("../../include/xmlada"); - for Source_Dirs use (Directories.Includedir & "/xmlada"); -+ for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr"; - for Library_Dir use Xmlada_Shared.Libdir; - for Library_Version use - "lib" & Project'Library_Name diff --git a/xmlada-2015-disable_static.patch b/xmlada-2015-disable_static.patch new file mode 100644 index 0000000..655fb36 --- /dev/null +++ b/xmlada-2015-disable_static.patch @@ -0,0 +1,58 @@ +diff --git a/Makefile.in b/Makefile.in +index 3ebb2d4..1cc50fd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,7 +1,7 @@ + ## The type of library we want to build. Possible values: + ## relocatable + ## static +-LIBRARY_TYPE=static ++LIBRARY_TYPE=relocatable + + # Replace with the location for the installation directory + PACKAGE_TARNAME=@PACKAGE_TARNAME@ +@@ -42,16 +42,8 @@ GPROPTS+=--target=${TARGET} + IPREFIX=${prefix}/${TARGET} + endif + +-ifeq (${BUILDS_SHARED},yes) +-all: static relocatable +-install: install-clean install-static install-relocatable +-else +-all: static +-install: install-clean install-static +-endif +- +-static: +- ${GPRBUILD} -m -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr ++all: relocatable ++install: install-clean install-relocatable + + shared relocatable: + ${GPRBUILD} -m -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr +@@ -92,16 +84,6 @@ ifneq (,$(wildcard $(IPREFIX)/$(PSUB)/manifests/xmlada_schema)) + --project-subdir=$(PSUB) xmlada_unicode + endif + +-## Do the installation for an explicit target +-install-static: +- ${GPRINSTALL} -f -p -XLIBRARY_TYPE=static ${GPROPTS} \ +- --prefix=${IPREFIX} --project-subdir=$(PSUB) \ +- --build-var=XMLADA_BUILD --build-name=static xmlada.gpr +- ${CP} distrib/xmlada.gpr ${IPREFIX}/$(PSUB) +-ifneq (${OS},Windows_NT) +- ${CHMOD} +x ${IPREFIX}/bin/xmlada-config +- cd ${IPREFIX}/lib; ${CHMOD} a-w xmlada_*/*.ali +-endif + + install-shared install-relocatable: + ${GPRINSTALL} -f -p -XLIBRARY_TYPE=relocatable ${GPROPTS} \ +@@ -112,7 +94,7 @@ clean_%: force + gprclean -XLIBRARY_TYPE=$* -q xmlada.gpr + gprclean -XLIBRARY_TYPE=$* -q -XTESTS_ACTIVATED=Yes xmlada.gpr + +-clean: clean_relocatable clean_static ++clean: clean_relocatable + cd docs; ${MAKE} -e clean + + distclean: clean diff --git a/xmlada.spec b/xmlada.spec index e75dfb5..aac16da 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,21 +1,16 @@ Name: xmlada -Version: 2013 -Release: 12%{?dist} +Version: 2015 +Release: 1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-2013-src.tgz -#Source0: xmlada-gpl-%{version}-src.tgz +Source0: xmlada-gpl-%{version}-src.tar.gz ## Fedora-specific -Patch2: %{name}-%{version}-gpr.patch -Patch1: %{name}-%{version}-gnatflags.patch -## Patch for use relocatable libs instead static -## and add DESTDIR option for make install -Patch0: %{name}-%{version}-destdir.patch -BuildRequires: chrpath +Patch1: %{name}-%{version}-disable_static.patch +BuildRequires: chrpath gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: @@ -40,76 +35,62 @@ Xml library for ada devel package. %prep %setup -q -n xmlada-gpl-%{version}-src -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %configure --disable-rpath --enable-shared --disable-static -make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes +make LIBRARY_TYPE=relocatable GPROPTS="%{GNAT_optflags}" prefix=%{buildroot}/%{_prefix} %install rm -rf %{buildroot} -export BUILDS_SHARED=yes -make install DESTDIR=%{buildroot} ADA_PROJECT_PATH=%_GNAT_project_dir BUILDS_SHARED=yes LIBDIR=%{_libdir} +export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" +make install LIBRARY_TYPE=relocatable prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; ## Delete old bash script (not needed now) rm -f %{buildroot}%{_bindir}/xmlada-config ## delete rpath manually (#674793) -chrpath --delete %{buildroot}%{_libdir}/%{name}/relocatable/libxmlada* +chrpath --delete %{buildroot}%{_libdir}/%{name}/libxmlada* 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 +cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %files %defattr(-,root,root,-) %doc README TODO AUTHORS COPYING* %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.* %{_libdir}/lib%{name}_unicode.so.* %{_libdir}/lib%{name}_sax.so.* -%{_libdir}/%{name}/relocatable/lib%{name}*.so.* +%{_libdir}/%{name}/lib%{name}*.so.* %files devel %defattr(-,root,root,-) %dir %{_includedir}/%{name} -%dir %{_GNAT_project_dir}/%{name} -%{_GNAT_project_dir}/%{name}.gpr -%{_GNAT_project_dir}/xmlada_shared.gpr -%{_GNAT_project_dir}/%{name}/xmlada_dom.lgpr -%{_GNAT_project_dir}/%{name}/xmlada_input_sources.lgpr -%{_GNAT_project_dir}/%{name}/xmlada_sax.lgpr -%{_GNAT_project_dir}/%{name}/xmlada_schema.lgpr -%{_GNAT_project_dir}/%{name}/xmlada_unicode.lgpr -%{_GNAT_project_dir}/%{name}_dom.gpr -%{_GNAT_project_dir}/%{name}_input.gpr -%{_GNAT_project_dir}/%{name}_sax.gpr -%{_GNAT_project_dir}/%{name}_schema.gpr -%{_GNAT_project_dir}/%{name}_unicode.gpr +%{_GNAT_project_dir}/%{name}*.gpr %{_includedir}/%{name}/*.adb %{_includedir}/%{name}/*.ads -%{_libdir}/%{name}/relocatable/*.ali -%{_libdir}/%{name}/relocatable/lib%{name}*.so +%{_libdir}/%{name}/*.ali +%{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so +%{_GNAT_project_dir}/manifests %changelog -* Fri Jun 19 2015 Fedora Release Engineering - 2013-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Wed Jun 17 2015 Pavel Zhukov <> - 2015-1 +- New release (#2015) * Wed Apr 29 2015 Peter Robinson 2013-11 - rebuild (gcc / gnat 5) @@ -157,45 +138,3 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* * Mon Dec 17 2012 Pavel Zhukov - 4.3-1 - New release - -* Tue Jan 10 2012 Pavel Zhukov - 4.1-3 -- Rebuild for new GCC-4.7 - -* Sat Jul 15 2011 Pavel Zhukov - 4.1-2 -- Update to new release GNAT-GPL-2011 -- Fix permissions - -* Wed Mar 30 2011 Pavel Zhukov - 3.2.1-11 -- Fix library type (add configure options) - -* Tue Mar 01 2011 Pavel Zhukov - 3.2.1-10 -- fix path for fedora-gnat-project-common - -* Tue Mar 01 2011 Pavel Zhukov - 3.2.1-9 -- use macros _GNAT_project_di -- fix hardcode includedir -- fix BuildRequires -- fix owned dir -- fix ?_isa - -* Sun Feb 20 2011 Pavel Zhukov - 3.2.1-8 -- fix spec errors -- fix directories for rawhide -- fix gcc-4.6 issues -- fix libdir - -* Fri Feb 11 2011 Pavel Zhukov - 3.2.1-6 -- move gpr to /usr/share/gpr(/xmlada) - -* Mon Feb 7 2011 Pavel Zhukov - 3.2.1-5 -- move so to -devel package fix spec errors - -* Sun Feb 6 2011 Pavel Zhukov - 3.2.1-4 -- fix dir owner - -* Sat Feb 5 2011 Pavel Zhukov - 3.2.1-3 -- fix errors in Makefile -- fix files list - -* Fri Feb 4 2011 Pavel Zhukov - 3.2.1-1 -- Initial spec From 5a05f6660c506d5500c25007135f10ed18d1bff9 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 23 Jun 2015 17:51:45 +0000 Subject: [PATCH 030/137] Install xmlada.gpr --- xmlada.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index aac16da..d0c8819 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -38,7 +38,7 @@ Xml library for ada devel package. %patch1 -p1 %build -%configure --disable-rpath --enable-shared --disable-static +%configure --disable-rpath --enable-shared --disable-static --enable-build=distrib make LIBRARY_TYPE=relocatable GPROPTS="%{GNAT_optflags}" prefix=%{buildroot}/%{_prefix} @@ -46,6 +46,8 @@ make LIBRARY_TYPE=relocatable GPROPTS="%{GNAT_optflags}" prefix=%{buildroot}/%{_ rm -rf %{buildroot} export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" make install LIBRARY_TYPE=relocatable prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" +## Installing main gpr file +cp distrib/%{name}.gpr %{buildroot}/%{_GNAT_project_dir} ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; @@ -89,6 +91,9 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Tue Jun 23 2015 Pavel Zhukov <> - 2015-2 +- Install xmlada.gpr + * Wed Jun 17 2015 Pavel Zhukov <> - 2015-1 - New release (#2015) From 72686aaafb232ff1885fa7cc65c3c55fdb364559 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 24 Jun 2015 07:31:02 +0000 Subject: [PATCH 031/137] Place includes into subdirectories --- xmlada-2015-gprinstall.patch | 63 ++++++++++++++++++++++++++++++++++++ xmlada.spec | 21 ++++++++---- 2 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 xmlada-2015-gprinstall.patch diff --git a/xmlada-2015-gprinstall.patch b/xmlada-2015-gprinstall.patch new file mode 100644 index 0000000..d0a10b8 --- /dev/null +++ b/xmlada-2015-gprinstall.patch @@ -0,0 +1,63 @@ +diff --git a/unicode/xmlada_unicode.gpr b/unicode/xmlada_unicode.gpr +index 8a5a2ac..290cfe6 100644 +--- a/unicode/xmlada_unicode.gpr ++++ b/unicode/xmlada_unicode.gpr +@@ -37,4 +37,8 @@ project XmlAda_Unicode is + package Binder renames Shared.Binder; + package Ide renames Shared.Ide; + ++ package Install is ++ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; ++ end Install; ++ + end XmlAda_Unicode; +diff --git a/dom/xmlada_dom.gpr b/dom/xmlada_dom.gpr +index 5c156ab..f6d37f6 100644 +--- a/dom/xmlada_dom.gpr ++++ b/dom/xmlada_dom.gpr +@@ -39,4 +39,7 @@ project XmlAda_Dom is + package Binder renames Shared.Binder; + package Ide renames Shared.Ide; + ++ package Install is ++ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; ++ end Install; + end XmlAda_Dom; +diff --git a/input_sources/xmlada_input.gpr b/input_sources/xmlada_input.gpr +index 7602590..329bdad 100644 +--- a/input_sources/xmlada_input.gpr ++++ b/input_sources/xmlada_input.gpr +@@ -39,6 +39,7 @@ project XmlAda_Input is + package Ide renames Shared.Ide; + + package Install is ++ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; + for Artifacts ("share/doc/xmlada") + use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); + for Artifacts ("share/gps/plug-ins/") use ("../distrib/xmlada_gps.py"); +diff --git a/sax/xmlada_sax.gpr b/sax/xmlada_sax.gpr +index f4d74ac..c146d79 100644 +--- a/sax/xmlada_sax.gpr ++++ b/sax/xmlada_sax.gpr +@@ -39,4 +39,8 @@ project XmlAda_Sax is + package Binder renames Shared.Binder; + package Ide renames Shared.Ide; + ++ package Install is ++ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; ++ end Install; ++ + end XmlAda_Sax; +diff --git a/schema/xmlada_schema.gpr b/schema/xmlada_schema.gpr +index 4688847..62dee2f 100644 +--- a/schema/xmlada_schema.gpr ++++ b/schema/xmlada_schema.gpr +@@ -40,4 +40,8 @@ project XmlAda_Schema is + package Binder renames Shared.Binder; + package Ide renames Shared.Ide; + ++ package Install is ++ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; ++ end Install; ++ + end XmlAda_Schema; diff --git a/xmlada.spec b/xmlada.spec index d0c8819..35ed654 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -10,7 +10,8 @@ URL: http://libre.adacore.com Source0: xmlada-gpl-%{version}-src.tar.gz ## Fedora-specific Patch1: %{name}-%{version}-disable_static.patch -BuildRequires: chrpath gprbuild +Patch2: %{name}-%{version}-gprinstall.patch +BuildRequires: chrpath gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: @@ -36,15 +37,17 @@ Xml library for ada devel package. %prep %setup -q -n xmlada-gpl-%{version}-src %patch1 -p1 +%patch2 -p1 %build %configure --disable-rpath --enable-shared --disable-static --enable-build=distrib -make LIBRARY_TYPE=relocatable GPROPTS="%{GNAT_optflags}" prefix=%{buildroot}/%{_prefix} +make LIBRARY_TYPE=relocatable GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install rm -rf %{buildroot} -export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" +###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" +export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --prefix=%{buildroot}" make install LIBRARY_TYPE=relocatable prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" ## Installing main gpr file cp distrib/%{name}.gpr %{buildroot}/%{_GNAT_project_dir} @@ -62,6 +65,8 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . +### TEMPORARY for upgrade procedure +cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}.so`; do ln -s $so $so.2013; done %files %defattr(-,root,root,-) @@ -79,10 +84,8 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %files devel %defattr(-,root,root,-) -%dir %{_includedir}/%{name} +%{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr -%{_includedir}/%{name}/*.adb -%{_includedir}/%{name}/*.ads %{_libdir}/%{name}/*.ali %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so @@ -91,6 +94,10 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Wed Jun 24 2015 Pavel Zhukov <> - 2015-3 +- Move sources to separate directories +- Add temporary symlinks to allow gprbuiild bootstraping + * Tue Jun 23 2015 Pavel Zhukov <> - 2015-2 - Install xmlada.gpr From 16bc4d8cdc69a2a1f403d1f2ecc94549c60cb4f1 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 24 Jun 2015 09:49:26 +0000 Subject: [PATCH 032/137] Apply temporary fix to solve chicken-egg problem with gprbuild --- xmlada.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 35ed654..cbd661d 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -66,7 +66,7 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . ### TEMPORARY for upgrade procedure -cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}.so`; do ln -s $so $so.2013; done +cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}*.so`; do ln -s $so $so.2013; done %files %defattr(-,root,root,-) @@ -94,9 +94,10 @@ cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}.so`; do ln -s $so $so.201 %changelog -* Wed Jun 24 2015 Pavel Zhukov <> - 2015-3 +* Wed Jun 24 2015 Pavel Zhukov <> - 2015-4 - Move sources to separate directories - Add temporary symlinks to allow gprbuiild bootstraping +- Fix temporary (upgrade) links pattern * Tue Jun 23 2015 Pavel Zhukov <> - 2015-2 - Install xmlada.gpr From b987c3c4a87be1415710e59d880e4a0c711b9f06 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 24 Jun 2015 17:41:45 +0000 Subject: [PATCH 033/137] Add temporary provides tag --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index cbd661d..74f91f4 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 4%{?dist} +Release: 6%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -16,6 +16,8 @@ BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: ExclusiveArch: %{GNAT_arches} +### UPGRADE HACK! REMOVE ME +Provides: libxmlada_dom.so.2013 libxmlada_input_sources.so.2013 libxmlada_schema.so.2013 libxmlada_sax.so.2013 %description @@ -94,10 +96,11 @@ cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}*.so`; do ln -s $so $so.20 %changelog -* Wed Jun 24 2015 Pavel Zhukov <> - 2015-4 +* Wed Jun 24 2015 Pavel Zhukov <> - 2015-6 - Move sources to separate directories - Add temporary symlinks to allow gprbuiild bootstraping - Fix temporary (upgrade) links pattern +- Provide previous version to upgrade gprbuild * Tue Jun 23 2015 Pavel Zhukov <> - 2015-2 - Install xmlada.gpr From 088eb97c3bb0cd914a2f2b45a06c73b194fd89e7 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 24 Jun 2015 21:05:41 +0000 Subject: [PATCH 034/137] Remove build hacks --- xmlada.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 74f91f4..89cc5d3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -16,8 +16,6 @@ BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: ExclusiveArch: %{GNAT_arches} -### UPGRADE HACK! REMOVE ME -Provides: libxmlada_dom.so.2013 libxmlada_input_sources.so.2013 libxmlada_schema.so.2013 libxmlada_sax.so.2013 %description @@ -67,8 +65,6 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . -### TEMPORARY for upgrade procedure -cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}*.so`; do ln -s $so $so.2013; done %files %defattr(-,root,root,-) @@ -96,6 +92,9 @@ cd %{buildroot}/%{_libdir} && for so in `ls lib%{name}*.so`; do ln -s $so $so.20 %changelog +* Wed Jun 24 2015 Pavel Zhukov <> - 2015-7 +- Remove temporary links + * Wed Jun 24 2015 Pavel Zhukov <> - 2015-6 - Move sources to separate directories - Add temporary symlinks to allow gprbuiild bootstraping From 9de504c9def7c07fdc1414497b5c7b152ada4af1 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 24 Jun 2015 21:07:16 +0000 Subject: [PATCH 035/137] Bump version --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 89cc5d3..82cffbf 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ From 60da8389480c97030df12de84d923cbd58e91a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 19 Dec 2015 21:31:50 +0100 Subject: [PATCH 036/137] Added a -static subpackage for linking GPRbuild statically. --- xmlada-2015-disable_static.patch | 58 -------------------------------- xmlada.spec | 54 ++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 71 deletions(-) delete mode 100644 xmlada-2015-disable_static.patch diff --git a/xmlada-2015-disable_static.patch b/xmlada-2015-disable_static.patch deleted file mode 100644 index 655fb36..0000000 --- a/xmlada-2015-disable_static.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 3ebb2d4..1cc50fd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,7 +1,7 @@ - ## The type of library we want to build. Possible values: - ## relocatable - ## static --LIBRARY_TYPE=static -+LIBRARY_TYPE=relocatable - - # Replace with the location for the installation directory - PACKAGE_TARNAME=@PACKAGE_TARNAME@ -@@ -42,16 +42,8 @@ GPROPTS+=--target=${TARGET} - IPREFIX=${prefix}/${TARGET} - endif - --ifeq (${BUILDS_SHARED},yes) --all: static relocatable --install: install-clean install-static install-relocatable --else --all: static --install: install-clean install-static --endif -- --static: -- ${GPRBUILD} -m -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -+all: relocatable -+install: install-clean install-relocatable - - shared relocatable: - ${GPRBUILD} -m -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -@@ -92,16 +84,6 @@ ifneq (,$(wildcard $(IPREFIX)/$(PSUB)/manifests/xmlada_schema)) - --project-subdir=$(PSUB) xmlada_unicode - endif - --## Do the installation for an explicit target --install-static: -- ${GPRINSTALL} -f -p -XLIBRARY_TYPE=static ${GPROPTS} \ -- --prefix=${IPREFIX} --project-subdir=$(PSUB) \ -- --build-var=XMLADA_BUILD --build-name=static xmlada.gpr -- ${CP} distrib/xmlada.gpr ${IPREFIX}/$(PSUB) --ifneq (${OS},Windows_NT) -- ${CHMOD} +x ${IPREFIX}/bin/xmlada-config -- cd ${IPREFIX}/lib; ${CHMOD} a-w xmlada_*/*.ali --endif - - install-shared install-relocatable: - ${GPRINSTALL} -f -p -XLIBRARY_TYPE=relocatable ${GPROPTS} \ -@@ -112,7 +94,7 @@ clean_%: force - gprclean -XLIBRARY_TYPE=$* -q xmlada.gpr - gprclean -XLIBRARY_TYPE=$* -q -XTESTS_ACTIVATED=Yes xmlada.gpr - --clean: clean_relocatable clean_static -+clean: clean_relocatable - cd docs; ${MAKE} -e clean - - distclean: clean diff --git a/xmlada.spec b/xmlada.spec index 82cffbf..9c6bd17 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -9,9 +9,8 @@ URL: http://libre.adacore.com ## http://libre.adacore.com/libre/download/ Source0: xmlada-gpl-%{version}-src.tar.gz ## Fedora-specific -Patch1: %{name}-%{version}-disable_static.patch Patch2: %{name}-%{version}-gprinstall.patch -BuildRequires: chrpath gprbuild +BuildRequires: gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: @@ -34,30 +33,47 @@ 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 -%patch1 -p1 %patch2 -p1 %build -%configure --disable-rpath --enable-shared --disable-static --enable-build=distrib -make LIBRARY_TYPE=relocatable GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} +%configure --disable-rpath --enable-shared --enable-static --enable-build=distrib +make GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install rm -rf %{buildroot} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" -export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --prefix=%{buildroot}" -make install LIBRARY_TYPE=relocatable prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" -## Installing main gpr file -cp distrib/%{name}.gpr %{buildroot}/%{_GNAT_project_dir} +export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir}" +## Install the shared libraries first and then the static ones, because +## apparently the variant that gprinstall sees first becomes the default in the +## project files. +OS=Windows_NT make install-relocatable install-static prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" +# Setting OS to "Windows_NT" circumvents a hardcoded "lib" in the makefile. +# This also skips the removal of write permission from the ALI files, so the +# files section compensates for that. + ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; ## Delete old bash script (not needed now) rm -f %{buildroot}%{_bindir}/xmlada-config -## delete rpath manually (#674793) -chrpath --delete %{buildroot}%{_libdir}/%{name}/libxmlada* 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 @@ -66,6 +82,12 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . + +%check +## Verify that there are no runpaths in the compiled libraries. +%{_rpmconfigdir}/check-rpaths + + %files %defattr(-,root,root,-) %doc README TODO AUTHORS COPYING* @@ -84,14 +106,20 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %defattr(-,root,root,-) %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr -%{_libdir}/%{name}/*.ali +%attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so %{_GNAT_project_dir}/manifests +%files static +%{_libdir}/%{name}/*.a + %changelog +* Sat Dec 19 2015 Björn Persson - 2015-8 +- Added a -static subpackage for linking GPRbuild statically. + * Wed Jun 24 2015 Pavel Zhukov <> - 2015-7 - Remove temporary links From 1b17ffed56f01812bd6bfc7e3e0c90b4e15a8d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 19 Dec 2015 21:34:52 +0100 Subject: [PATCH 037/137] Added documentation back. --- xmlada.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 9c6bd17..e8b0f40 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -79,6 +79,8 @@ install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ ## 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/* +## These Sphinx-generated files aren't needed in the package: +rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . @@ -110,6 +112,11 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so %{_GNAT_project_dir}/manifests +%{_pkgdocdir}/*.html +%{_pkgdocdir}/searchindex.js +%{_pkgdocdir}/_sources +%{_pkgdocdir}/_static +%{_pkgdocdir}/XMLAda.pdf %files static From b1cbb7643306e9f838ece9950713662ca27714b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 31 Jan 2016 18:47:05 +0100 Subject: [PATCH 038/137] Rebuild XMLada with GCC6 on x86 and x86-64 to enable bootstrapping GPRbuild on ARM. --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index e8b0f40..e6bb3be 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -14,7 +14,7 @@ BuildRequires: gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 # xmlada and gcc-gnat only available on these: -ExclusiveArch: %{GNAT_arches} +ExclusiveArch: %{ix86} x86_64 %description @@ -124,6 +124,9 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Sun Jan 31 2016 Björn Persson - 2015-9 +- Rebuilt on x86 and x86-64. + * Sat Dec 19 2015 Björn Persson - 2015-8 - Added a -static subpackage for linking GPRbuild statically. From f250d81a129d8cde66eaf6e050464546920064ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 1 Feb 2016 01:26:44 +0100 Subject: [PATCH 039/137] Rebuild with GCC 6 even on ARM. --- xmlada.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index e6bb3be..0a26069 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -13,8 +13,8 @@ Patch2: %{name}-%{version}-gprinstall.patch BuildRequires: gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 -# xmlada and gcc-gnat only available on these: -ExclusiveArch: %{ix86} x86_64 +# Build only on architectures where GNAT and GPRbuild are available: +ExclusiveArch: %{GPRbuild_arches} %description @@ -124,8 +124,8 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog -* Sun Jan 31 2016 Björn Persson - 2015-9 -- Rebuilt on x86 and x86-64. +* Sun Jan 31 2016 Björn Persson - 2015-10 +- Rebuilt with GCC 6 prerelease. * Sat Dec 19 2015 Björn Persson - 2015-8 - Added a -static subpackage for linking GPRbuild statically. From 33f7b47ac93ac02616e4f6e5cbfb6f83a94e8026 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:35:30 +0000 Subject: [PATCH 040/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 0a26069..0718d8a 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 10%{?dist} +Release: 11%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -124,6 +124,9 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2015-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jan 31 2016 Björn Persson - 2015-10 - Rebuilt with GCC 6 prerelease. From beda69cefdd4223aae1050b1d3c56bef712204d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 1 May 2016 23:36:24 +0200 Subject: [PATCH 041/137] Tagged the license file as such. --- xmlada.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0718d8a..e1e3dae 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2015 -Release: 11%{?dist} +Release: 12%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv2+ @@ -92,7 +92,8 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %files %defattr(-,root,root,-) -%doc README TODO AUTHORS COPYING* +%license COPYING* +%doc README TODO AUTHORS %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* @@ -124,6 +125,9 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Sun May 01 2016 Björn Persson - 2015-12 +- Tagged the license file as such. + * Fri Feb 05 2016 Fedora Release Engineering - 2015-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From fe555c7a3dc87898c4e966be7e366a90da68c30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 8 Aug 2016 10:05:02 +0200 Subject: [PATCH 042/137] Upgraded to the 2016 release. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit · Removed the irrelevant and FHS-violating manifest file. · The license has changed to GPLv3+. --- .gitignore | 1 + sources | 2 +- ...tall.patch => xmlada-2016-gprinstall.patch | 2 +- xmlada.spec | 33 ++++++++++++------- 4 files changed, 25 insertions(+), 13 deletions(-) rename xmlada-2015-gprinstall.patch => xmlada-2016-gprinstall.patch (96%) diff --git a/.gitignore b/.gitignore index d6bd190..7cc6e35 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xmlada-gpl-4.3-src.tgz /xmlada-gpl-2013-src.tgz /xmlada-gpl-2015-src.tar.gz +/xmlada-gpl-2016-src.tar.gz diff --git a/sources b/sources index bd452ca..baf4531 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98c96b8c6a877617ec4da3ef6a03288a xmlada-gpl-2015-src.tar.gz +631957d2f55277f1d58a68186fbf5022 xmlada-gpl-2016-src.tar.gz diff --git a/xmlada-2015-gprinstall.patch b/xmlada-2016-gprinstall.patch similarity index 96% rename from xmlada-2015-gprinstall.patch rename to xmlada-2016-gprinstall.patch index d0a10b8..e134248 100644 --- a/xmlada-2015-gprinstall.patch +++ b/xmlada-2016-gprinstall.patch @@ -34,7 +34,7 @@ index 7602590..329bdad 100644 + for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; for Artifacts ("share/doc/xmlada") use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); - for Artifacts ("share/gps/plug-ins/") use ("../distrib/xmlada_gps.py"); + for Artifacts ("lib/gnat") use ("../distrib/xmlada.gpr"); diff --git a/sax/xmlada_sax.gpr b/sax/xmlada_sax.gpr index f4d74ac..c146d79 100644 --- a/sax/xmlada_sax.gpr diff --git a/xmlada.spec b/xmlada.spec index e1e3dae..b64e6fe 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,9 +1,9 @@ Name: xmlada -Version: 2015 -Release: 12%{?dist} +Version: 2016 +Release: 1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries -License: GPLv2+ +License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ @@ -26,7 +26,6 @@ It includes support for validating XML files with XML schemas. %package devel Summary: XML library for Ada devel package Group: Development/Libraries -License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fedora-gnat-project-common >= 2 @@ -54,7 +53,7 @@ possible. %build %configure --disable-rpath --enable-shared --enable-static --enable-build=distrib -make GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} +make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install @@ -64,10 +63,7 @@ export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib- ## Install the shared libraries first and then the static ones, because ## apparently the variant that gprinstall sees first becomes the default in the ## project files. -OS=Windows_NT make install-relocatable install-static prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" -# Setting OS to "Windows_NT" circumvents a hardcoded "lib" in the makefile. -# This also skips the removal of write permission from the ALI files, so the -# files section compensates for that. +make install-relocatable install-static prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; @@ -84,6 +80,17 @@ rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} ## only-non-binary-in-usr-lib cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . +## Move a misplaced project file into place. +mv %{buildroot}%{_prefix}/lib/gnat/* %{buildroot}%{_GNAT_project_dir}/ + +## 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 apparently undocumented, but my crystal +## ball tells me that they're used when GPRinstall uninstalls or upgrades +## packages. The manifest file is therefore irrelevant in this RPM package, so +## delete it. +rm -rf %{buildroot}%{_GNAT_project_dir}/manifests + %check ## Verify that there are no runpaths in the compiled libraries. @@ -93,7 +100,7 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %files %defattr(-,root,root,-) %license COPYING* -%doc README TODO AUTHORS +%doc README.md TODO AUTHORS %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* @@ -112,7 +119,6 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so -%{_GNAT_project_dir}/manifests %{_pkgdocdir}/*.html %{_pkgdocdir}/searchindex.js %{_pkgdocdir}/_sources @@ -125,6 +131,11 @@ cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . %changelog +* Mon Aug 08 2016 Björn Persson - 2016-1 +- Upgraded to the 2016 release. +- Removed the irrelevant and FHS-violating manifest file. +- The license has changed to GPLv3+. + * Sun May 01 2016 Björn Persson - 2015-12 - Tagged the license file as such. From 3ce55fdf9de89b0fe0291de7c2556cab647863f9 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 4 Feb 2017 14:11:01 +0100 Subject: [PATCH 043/137] Rebuild with new gnat --- xmlada.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index b64e6fe..0cbcfa5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -131,6 +131,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Sat Feb 4 2017 Pavel Zhukov - 2016-1 +- Rebuild with new gnat + * Mon Aug 08 2016 Björn Persson - 2016-1 - Upgraded to the 2016 release. - Removed the irrelevant and FHS-violating manifest file. From 423db0e30bd876027edc186435731a6ee61c6116 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 4 Feb 2017 14:26:10 +0100 Subject: [PATCH 044/137] Bump release tag --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 0cbcfa5..a9f2fc7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2016 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ From a47898855daa59421984c9b7b750244d21f2935c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:56:55 +0000 Subject: [PATCH 045/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a9f2fc7..6db16f6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2016 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -131,6 +131,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2016-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Feb 4 2017 Pavel Zhukov - 2016-1 - Rebuild with new gnat From 2b51263147345c8065a319dfd3c2f0392e37a115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 12 Feb 2017 10:49:02 +0100 Subject: [PATCH 046/137] Adapted to another silly change in the directory layout. --- xmlada.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 6db16f6..fbb0fcc 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -59,7 +59,7 @@ make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install rm -rf %{buildroot} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" -export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir}" +export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" ## Install the shared libraries first and then the static ones, because ## apparently the variant that gprinstall sees first becomes the default in the ## project files. @@ -77,8 +77,6 @@ rm -f %{buildroot}/%{_datadir}/gps/plug-ins/%{name}_gps.py* rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## These Sphinx-generated files aren't needed in the package: rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} -## only-non-binary-in-usr-lib -cd %{buildroot}/%{_libdir} && ln -s %{name}/lib%{name}*.so.* . ## Move a misplaced project file into place. mv %{buildroot}%{_prefix}/lib/gnat/* %{buildroot}%{_GNAT_project_dir}/ From 7b5a3901f4b3635349bbac3e78fcba80c06219fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 12 Feb 2017 11:54:13 +0100 Subject: [PATCH 047/137] Made a temporary workaround to rebuild with GCC 7 prerelease. --- gprbuild-2016-gcc7.patch | 12 ++++++++++++ xmlada.spec | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 gprbuild-2016-gcc7.patch diff --git a/gprbuild-2016-gcc7.patch b/gprbuild-2016-gcc7.patch new file mode 100644 index 0000000..19c28b0 --- /dev/null +++ b/gprbuild-2016-gcc7.patch @@ -0,0 +1,12 @@ +--- compilers.xml 2016-11-03 02:12:40.000000000 -0600 ++++ compilers.xml 2017-02-11 17:30:04.705825349 -0700 +@@ -746,8 +746,7 @@ + + Ada + +- ${PREFIX}gcc -v +- ++ ${PREFIX}gcc -dumpversion + + + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ diff --git a/xmlada.spec b/xmlada.spec index fbb0fcc..32d47ea 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -8,6 +8,7 @@ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ Source0: xmlada-gpl-%{version}-src.tar.gz +Source1: gprbuild-2016-gcc7.patch ## Fedora-specific Patch2: %{name}-%{version}-gprinstall.patch BuildRequires: gprbuild @@ -52,11 +53,20 @@ possible. %patch2 -p1 %build +mkdir -p hack/bin +cp -a /usr/share/gprconfig hack +patch hack/gprconfig/compilers.xml %{SOURCE1} +( echo "#!/bin/sh" ; echo "/usr/bin/gprconfig --db $PWD/hack/gprconfig --db- \"\$@\"" ) >hack/bin/gprconfig +chmod a+x hack/bin/gprconfig +PATH=$PWD/hack/bin:$PATH + %configure --disable-rpath --enable-shared --enable-static --enable-build=distrib make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install +PATH=$PWD/hack/bin:$PATH + rm -rf %{buildroot} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" @@ -129,8 +139,8 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog -* Sat Feb 11 2017 Fedora Release Engineering - 2016-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Sun Feb 12 2017 Björn Persson - 2016-3 +- Made a temporary workaround to rebuild with GCC 7 prerelease. * Sat Feb 4 2017 Pavel Zhukov - 2016-1 - Rebuild with new gnat From cb5b1b51c19272382b89a16dcd34d63f398719ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Fri, 17 Feb 2017 09:10:56 +0100 Subject: [PATCH 048/137] Reverted the temporary workaround. --- gprbuild-2016-gcc7.patch | 12 ------------ xmlada.spec | 15 ++++----------- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 gprbuild-2016-gcc7.patch diff --git a/gprbuild-2016-gcc7.patch b/gprbuild-2016-gcc7.patch deleted file mode 100644 index 19c28b0..0000000 --- a/gprbuild-2016-gcc7.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- compilers.xml 2016-11-03 02:12:40.000000000 -0600 -+++ compilers.xml 2017-02-11 17:30:04.705825349 -0700 -@@ -746,8 +746,7 @@ - - Ada - -- ${PREFIX}gcc -v -- -+ ${PREFIX}gcc -dumpversion - - - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ diff --git a/xmlada.spec b/xmlada.spec index 32d47ea..b085cf4 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2016 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -8,7 +8,6 @@ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ Source0: xmlada-gpl-%{version}-src.tar.gz -Source1: gprbuild-2016-gcc7.patch ## Fedora-specific Patch2: %{name}-%{version}-gprinstall.patch BuildRequires: gprbuild @@ -53,20 +52,11 @@ possible. %patch2 -p1 %build -mkdir -p hack/bin -cp -a /usr/share/gprconfig hack -patch hack/gprconfig/compilers.xml %{SOURCE1} -( echo "#!/bin/sh" ; echo "/usr/bin/gprconfig --db $PWD/hack/gprconfig --db- \"\$@\"" ) >hack/bin/gprconfig -chmod a+x hack/bin/gprconfig -PATH=$PWD/hack/bin:$PATH - %configure --disable-rpath --enable-shared --enable-static --enable-build=distrib make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install -PATH=$PWD/hack/bin:$PATH - rm -rf %{buildroot} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" @@ -139,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Fri Feb 17 2017 Björn Persson - 2016-4 +- Reverted the temporary workaround. + * Sun Feb 12 2017 Björn Persson - 2016-3 - Made a temporary workaround to rebuild with GCC 7 prerelease. From f8057ff0ac1e4b7ce89c76aa766142b654e2250b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 20 Apr 2017 09:42:12 +0200 Subject: [PATCH 049/137] Rebuild for properly linking sec arches --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index b085cf4..4e8aa18 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2016 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Wed Apr 20 2017 Pavel Zhukov <> - 2016-5 +- Rebuild to fix non x86 arches ali versions + * Fri Feb 17 2017 Björn Persson - 2016-4 - Reverted the temporary workaround. From 1ede0dc65ff70cc48c5b20ddda627d2b23b062b6 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 7 Jul 2017 17:11:45 +0200 Subject: [PATCH 050/137] New release 2017 --- .gitignore | 1 + sources | 2 +- xmlada.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7cc6e35..9cef34a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xmlada-gpl-2013-src.tgz /xmlada-gpl-2015-src.tar.gz /xmlada-gpl-2016-src.tar.gz +/xmlada-gpl-2017-src.tar.gz diff --git a/sources b/sources index baf4531..2dc1b55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -631957d2f55277f1d58a68186fbf5022 xmlada-gpl-2016-src.tar.gz +SHA512 (xmlada-gpl-2017-src.tar.gz) = 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/xmlada.spec b/xmlada.spec index 4e8aa18..bc3f001 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada -Version: 2016 -Release: 5%{?dist} +Version: 2017 +Release: 1%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -9,7 +9,7 @@ URL: http://libre.adacore.com ## http://libre.adacore.com/libre/download/ Source0: xmlada-gpl-%{version}-src.tar.gz ## Fedora-specific -Patch2: %{name}-%{version}-gprinstall.patch +Patch2: %{name}-2016-gprinstall.patch BuildRequires: gprbuild BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Fri Jul 7 2017 Pavel Zhukov - 2017-1 +- New version (2017) + * Wed Apr 20 2017 Pavel Zhukov <> - 2016-5 - Rebuild to fix non x86 arches ali versions From 4ac526462dd3f3d6f041daa6f02d1f28b06320cb Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 15 Jul 2017 12:24:14 +0200 Subject: [PATCH 051/137] rebuild with new gprbuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index bc3f001..3d14507 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Sat Jul 15 2017 Pavel Zhukov - 2017-2 +- rebuild with new gprbuild + * Fri Jul 7 2017 Pavel Zhukov - 2017-1 - New version (2017) From d6a4ec3f9d881b7f6bafdea1510bef2df750e4e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:12:51 +0000 Subject: [PATCH 052/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 3d14507..69a3112 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2017-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Jul 15 2017 Pavel Zhukov - 2017-2 - rebuild with new gprbuild From 558ca340e294bb634c0d1c652c198150ff35a956 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:46:51 +0000 Subject: [PATCH 053/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 69a3112..917ac95 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2017-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2017-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From bebf4c2e59f9a7b2ac8fa28eb1595b383c6b6e22 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 6 Feb 2018 09:37:25 +0100 Subject: [PATCH 054/137] Rebuild with new gnat --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 917ac95..6a9a7b5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %changelog +* Tue Feb 6 2018 Pavel Zhukov - 2017-5 +- Rebuild with new gnat + * Thu Aug 03 2017 Fedora Release Engineering - 2017-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 7b7a4fd5059e57b75aeef5d336f8134e625505fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 24 Feb 2018 18:43:58 +0100 Subject: [PATCH 055/137] Removed buildroot deletion. Cleaning the buildroot has been unnecessary for a long time. --- xmlada.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 6a9a7b5..ded3172 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -57,7 +57,6 @@ make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %install -rm -rf %{buildroot} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" ## Install the shared libraries first and then the static ones, because From c2d640dbadfc2f0c48b9cedc05836d3b19dbbf0f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 3 Apr 2018 09:43:33 +0200 Subject: [PATCH 056/137] Build source package on non gprbuild-enables architectures --- xmlada.spec | 55 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index ded3172..75f887c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -10,11 +10,17 @@ URL: http://libre.adacore.com Source0: xmlada-gpl-%{version}-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch + +# Build on architectures where gprbuild is available +# on architectures without gprbuild provide source package only +# which is unpacked tarball for the purpose of bootstrapping of gprbuild +# bootstrap on ! %{GPRbuild_arches} +%ifarch %{GPRbuild_arches} BuildRequires: gprbuild BuildRequires: gcc-gnat +%endif + BuildRequires: fedora-gnat-project-common >= 2 -# Build only on architectures where GNAT and GPRbuild are available: -ExclusiveArch: %{GPRbuild_arches} %description @@ -23,7 +29,8 @@ full support for SAX, and an almost complete support for the core part of the DOM. It includes support for validating XML files with XML schemas. -%package devel +%ifarch %{GPRbuild_arches} +%package devel Summary: XML library for Ada devel package Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} @@ -46,17 +53,33 @@ libraries are upgraded. Other Fedora packages shall require xmlada-devel rather than xmlada-static if possible. +%else + +%global debug_package %{nil} + +%package sources +Summary: Source of XMLada for bootstrapping +Group: Development/Libraries + +%description sources +On architectures without gprbuild installs sources for gprbuild's bootstrap + +%endif %prep %setup -q -n xmlada-gpl-%{version}-src -%patch2 -p1 +%patch2 -p1 %build -%configure --disable-rpath --enable-shared --enable-static --enable-build=distrib +%ifarch %{GPRbuild_arches} +%configure --disable-rpath --enable-shared --disable-static --enable-build=distrib make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} - +%else +%configure --enable-static --enable-build=distrib +%endif %install +%ifarch %{GPRbuild_arches} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" ## Install the shared libraries first and then the static ones, because @@ -87,6 +110,12 @@ mv %{buildroot}%{_prefix}/lib/gnat/* %{buildroot}%{_GNAT_project_dir}/ ## packages. The manifest file is therefore irrelevant in this RPM package, so ## delete it. rm -rf %{buildroot}%{_GNAT_project_dir}/manifests +%else +mkdir -p %{buildroot}/%{_includedir}/%{name}/sources +cp -r . %{buildroot}/%{_includedir}/%{name}/sources +find %{buildroot}/%{_includedir}/%{name}/sources -type f ! -name "*ad[sb]" ! -name "*gpr" -delete +find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete +%endif %check @@ -94,10 +123,11 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %{_rpmconfigdir}/check-rpaths -%files +%files %defattr(-,root,root,-) %license COPYING* %doc README.md TODO AUTHORS +%ifarch %{GPRbuild_arches} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* @@ -106,9 +136,11 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %{_libdir}/lib%{name}_unicode.so.* %{_libdir}/lib%{name}_sax.so.* %{_libdir}/%{name}/lib%{name}*.so.* +%endif +%ifarch %{GPRbuild_arches} %files devel %defattr(-,root,root,-) %{_includedir}/%{name} @@ -126,8 +158,15 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %files static %{_libdir}/%{name}/*.a +%else +%files sources +%{_includedir}/%{name} +%endif %changelog +* Tue Apr 3 2018 Pavel Zhukov - 2017-6 +- Build source packages on non gprbuild enabled arches for bootstraping + * Tue Feb 6 2018 Pavel Zhukov - 2017-5 - Rebuild with new gnat From 61f1bdf790af791ca5abff0729245cf923e468b8 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 9 Jul 2018 23:55:05 -0500 Subject: [PATCH 057/137] Remove needless use of %defattr --- xmlada.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 75f887c..38ff361 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -124,7 +124,6 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %files -%defattr(-,root,root,-) %license COPYING* %doc README.md TODO AUTHORS %ifarch %{GPRbuild_arches} @@ -142,7 +141,6 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %ifarch %{GPRbuild_arches} %files devel -%defattr(-,root,root,-) %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr %attr(444,-,-) %{_libdir}/%{name}/*.ali From 3efaeed0672904a293c506b9c3d51bdfa19cb7b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:22:59 +0000 Subject: [PATCH 058/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 38ff361..04d99d6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada Group: System Environment/Libraries License: GPLv3+ @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2017-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Apr 3 2018 Pavel Zhukov - 2017-6 - Build source packages on non gprbuild enabled arches for bootstraping From 17aa5f5ba0df8ec57582b1d7369aa95e28256132 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 059/137] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xmlada.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 04d99d6..ba23ac3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -2,7 +2,6 @@ Name: xmlada Version: 2017 Release: 7%{?dist} Summary: XML library for Ada -Group: System Environment/Libraries License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable @@ -32,7 +31,6 @@ It includes support for validating XML files with XML schemas. %ifarch %{GPRbuild_arches} %package devel Summary: XML library for Ada devel package -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fedora-gnat-project-common >= 2 @@ -42,7 +40,6 @@ 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 @@ -59,7 +56,6 @@ possible. %package sources Summary: Source of XMLada for bootstrapping -Group: Development/Libraries %description sources On architectures without gprbuild installs sources for gprbuild's bootstrap From 84037ad5e7a9dc4e77a56c17ab6e3733f21d5ba1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:32:20 +0000 Subject: [PATCH 060/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index ba23ac3..b7dbb83 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,6 @@ Name: xmlada Version: 2017 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -158,6 +158,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2017-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2017-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From cbb30e8d52313df7d105fc96e788db45fec5fb1d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 5 Feb 2019 13:21:08 +0100 Subject: [PATCH 061/137] Produce sources only in bootstap mode --- xmlada.spec | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index b7dbb83..b00e104 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,25 +1,29 @@ +%global bootstrap_arch %{GPRbuild_arches} +## Set this variable to %{GPRbuild_arches} for bootraping of +## gprbuild on new architecture or in case of new magor verion of +## gcc-gnat package + Name: xmlada -Version: 2017 -Release: 8%{?dist} +Version: 2018 +Release: 2%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-%{version}-src.tar.gz +Source0: xmlada-gpl-2018-20180524-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch -# Build on architectures where gprbuild is available -# on architectures without gprbuild provide source package only -# which is unpacked tarball for the purpose of bootstrapping of gprbuild -# bootstrap on ! %{GPRbuild_arches} -%ifarch %{GPRbuild_arches} + + +%ifnarch %{bootstrap_arch} BuildRequires: gprbuild BuildRequires: gcc-gnat +BuildRequires: fedora-gnat-project-common >= 2 %endif -BuildRequires: fedora-gnat-project-common >= 2 +ExclusiveArch: %{GPRbuild_arches} %description @@ -28,7 +32,7 @@ full support for SAX, and an almost complete support for the core part of the DOM. It includes support for validating XML files with XML schemas. -%ifarch %{GPRbuild_arches} +%ifnarch %{bootstrap_arch} %package devel Summary: XML library for Ada devel package Requires: %{name}%{?_isa} = %{version}-%{release} @@ -64,10 +68,9 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %prep %setup -q -n xmlada-gpl-%{version}-src -%patch2 -p1 %build -%ifarch %{GPRbuild_arches} +%ifnarch %{bootstrap_arch} %configure --disable-rpath --enable-shared --disable-static --enable-build=distrib make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %else @@ -75,7 +78,7 @@ make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} %endif %install -%ifarch %{GPRbuild_arches} +%ifnarch %{bootstrap_arch} ###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" ## Install the shared libraries first and then the static ones, because @@ -96,9 +99,8 @@ rm -f %{buildroot}/%{_libdir}/%{name}/static/* ## These Sphinx-generated files aren't needed in the package: rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} -## Move a misplaced project file into place. -mv %{buildroot}%{_prefix}/lib/gnat/* %{buildroot}%{_GNAT_project_dir}/ - +mkdir -p %{buildroot}/%{_datarootdir}/%{name} +mv %{buildroot}/%{_datarootdir}/examples %{buildroot}/%{_datarootdir}/%{name} ## 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 apparently undocumented, but my crystal @@ -122,7 +124,7 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %files %license COPYING* %doc README.md TODO AUTHORS -%ifarch %{GPRbuild_arches} +%ifnarch %{bootstrap_arch} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* @@ -135,7 +137,7 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete -%ifarch %{GPRbuild_arches} +%ifnarch %{bootstrap_arch} %files devel %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr @@ -147,6 +149,7 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %{_pkgdocdir}/_sources %{_pkgdocdir}/_static %{_pkgdocdir}/XMLAda.pdf +%{_datarootdir}/%{name} %files static @@ -158,6 +161,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Feb 5 2019 Pavel Zhukov - 2018-2 +- Produce source only package in bootstrap mode + * Sun Feb 03 2019 Fedora Release Engineering - 2017-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 41222ee86bf48a89d7e78e8254e3eb45c6739f88 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 5 Feb 2019 13:30:56 +0100 Subject: [PATCH 062/137] Upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9cef34a..95ed331 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xmlada-gpl-2015-src.tar.gz /xmlada-gpl-2016-src.tar.gz /xmlada-gpl-2017-src.tar.gz +/xmlada-gpl-2018-20180524-src.tar.gz diff --git a/sources b/sources index 2dc1b55..ff845e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-gpl-2017-src.tar.gz) = 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 +SHA512 (xmlada-gpl-2018-20180524-src.tar.gz) = 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 From b5c69d8e8ad00aa80613732f76093ef15bfeeabf Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 5 Feb 2019 14:30:26 +0100 Subject: [PATCH 063/137] Rebuild with new gprbuild --- xmlada.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index b00e104..0659ddf 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,11 +1,12 @@ -%global bootstrap_arch %{GPRbuild_arches} +## %global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch NONEARCH ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -161,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Feb 5 2019 Pavel Zhukov - 2018-3 +- Rebuild with new gprbuild + * Tue Feb 5 2019 Pavel Zhukov - 2018-2 - Produce source only package in bootstrap mode From ac8ab4dca3d6dcaefea138b04c1ac63cae1cc79d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 6 Feb 2019 11:10:40 +0100 Subject: [PATCH 064/137] Rebuild for ppc64le --- xmlada.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0659ddf..425c1a5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,7 +162,7 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog -* Tue Feb 5 2019 Pavel Zhukov - 2018-3 +* Tue Feb 5 2019 Pavel Zhukov - 2018-4 - Rebuild with new gprbuild * Tue Feb 5 2019 Pavel Zhukov - 2018-2 From 4541ef781654e903dab233f15710942e38579604 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 6 Feb 2019 11:20:57 +0100 Subject: [PATCH 065/137] Rebootstrap --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 425c1a5..1cb5ac7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,5 +1,5 @@ ## %global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch NONEARCH +%global bootstrap_arch %{GPRbuild_arches} ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package From 5e6087569e652923ea728b049e32930f6b368e1a Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 9 Feb 2019 15:09:07 +0100 Subject: [PATCH 066/137] Rebuild with new gnat-srpm-macros --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 1cb5ac7..b1e8ca1 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Feb 9 2019 Pavel Zhukov - 2018-5 +Rebuld with new gnat-rpm-macros + * Tue Feb 5 2019 Pavel Zhukov - 2018-4 - Rebuild with new gprbuild From 1244406ccad96a346b637928a32d761ba058388b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 9 Feb 2019 22:03:33 +0100 Subject: [PATCH 067/137] Rebuild with new gprbuild --- xmlada.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index b1e8ca1..2064842 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ ## %global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch NONE ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,8 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog -* Sat Feb 9 2019 Pavel Zhukov - 2018-5 -Rebuld with new gnat-rpm-macros +* Sat Feb 9 2019 Pavel Zhukov - 2018-6 +- Rebuld with new gnat-rpm-macros +- Build with gprbuild 2018 * Tue Feb 5 2019 Pavel Zhukov - 2018-4 - Rebuild with new gprbuild From 6d3ffd887020901222b60f65a03f0db40ecc7ebe Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 10 Feb 2019 15:57:16 +0100 Subject: [PATCH 068/137] Rebuild with new gprbuild --- xmlada.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 2064842..76427e1 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -19,7 +19,7 @@ Patch2: %{name}-2016-gprinstall.patch %ifnarch %{bootstrap_arch} -BuildRequires: gprbuild +BuildRequires: gprbuild > 2018-10 BuildRequires: gcc-gnat BuildRequires: fedora-gnat-project-common >= 2 %endif @@ -162,7 +162,7 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog -* Sat Feb 9 2019 Pavel Zhukov - 2018-6 +* Sat Feb 9 2019 Pavel Zhukov - 2018-7 - Rebuld with new gnat-rpm-macros - Build with gprbuild 2018 From e38d8b336e7b0ac6402a49fa9a9081ab334f1e99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:19:58 +0000 Subject: [PATCH 069/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 76427e1..eb440e3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2018-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 9 2019 Pavel Zhukov - 2018-7 - Rebuld with new gnat-rpm-macros - Build with gprbuild 2018 From 0ff9658004589a627f514c1ac48ecb3e28e2010e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:35:39 +0000 Subject: [PATCH 070/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index eb440e3..f95a985 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2018 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2018-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2018-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 05dfe226ed116f0bdbd7f88f3ccdb75cf6d4d6b8 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 3 Feb 2020 11:19:25 +0100 Subject: [PATCH 071/137] gcc 10 bootstrap --- xmlada.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index f95a985..42e37f8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ -## %global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch NONE +%global bootstrap_arch %{GPRbuild_arches} +### global bootstrap_arch ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Pavel Zhukov - 2018-10 +- Gcc 10 bootstrap + * Fri Jan 31 2020 Fedora Release Engineering - 2018-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e3c5e6efde62a1599f7470500d1c84e646b68e13 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 3 Feb 2020 11:46:50 +0100 Subject: [PATCH 072/137] rebuild with new gprbuild --- xmlada.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 42e37f8..1a1c312 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ -%global bootstrap_arch %{GPRbuild_arches} -### global bootstrap_arch +### global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2018 -Release: 10%{?dist} +Release: 11%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Pavel Zhukov - 2018-11 +- rebuild with new gprbuild + * Mon Feb 3 2020 Pavel Zhukov - 2018-10 - Gcc 10 bootstrap From 2c8c30bb065833fb6f7b98925c2d0aa02771dce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 3 Feb 2020 12:59:38 +0100 Subject: [PATCH 073/137] Upgraded to the 2019 release. Other than the year number, the only change is an adaptation to an incompatible API change in GNAT.Sockets. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 95ed331..98b31f9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xmlada-gpl-2016-src.tar.gz /xmlada-gpl-2017-src.tar.gz /xmlada-gpl-2018-20180524-src.tar.gz +/xmlada-2019-20190429-19B9D-src.tar.gz diff --git a/sources b/sources index ff845e1..e00e549 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-gpl-2018-20180524-src.tar.gz) = 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 +SHA512 (xmlada-2019-20190429-19B9D-src.tar.gz) = f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 diff --git a/xmlada.spec b/xmlada.spec index 1a1c312..a7623d7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -5,14 +5,14 @@ ## gcc-gnat package Name: xmlada -Version: 2018 -Release: 11%{?dist} +Version: 2019 +Release: 1%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-gpl-2018-20180524-src.tar.gz +Source0: xmlada-2019-20190429-19B9D-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch @@ -68,7 +68,7 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-gpl-%{version}-src +%setup -q -n xmlada-2019-20190429-19B9D-src %build %ifnarch %{bootstrap_arch} @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Feb 3 2020 Björn Persson - 2019-1 +- Upgraded to the 2019 release. + * Mon Feb 3 2020 Pavel Zhukov - 2018-11 - rebuild with new gprbuild From 316680df6a31772bfde712c66ef76f104ce8ecf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 3 Feb 2020 13:04:56 +0100 Subject: [PATCH 074/137] A macro must have a value. --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a7623d7..7d413ff 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,5 +1,5 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch +%global bootstrap_arch not_bootstrapping ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package From 4373ed3b71ebb9f4d3b29bc73d3cb08ab080e0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:49:53 +0000 Subject: [PATCH 075/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 7d413ff..a3a2047 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2019 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2019-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Feb 3 2020 Björn Persson - 2019-1 - Upgraded to the 2019 release. From 6d0219d448c913b52b85f48cec86a82e351ddffe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:45:38 +0000 Subject: [PATCH 076/137] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a3a2047..2c011f5 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ Name: xmlada Version: 2019 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,10 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2019-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2019-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2598b3670fbd40500e643b6a31bc286a25de0d78 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 7 Dec 2020 11:56:16 -0700 Subject: [PATCH 077/137] - Gcc 11 bootstrap --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 2c011f5..77f0a13 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,12 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch not_bootstrapping +%global bootstrap_arch %{GPRbuild_arches} ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2019 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Dec 07 2020 Jeff Law - 2019-4 +- Gcc 11 bootstrap + * Sat Aug 01 2020 Fedora Release Engineering - 2019-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fbe6082387ab8a0d9e05794d1ede1f8449f36d3f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 8 Dec 2020 08:19:06 +0100 Subject: [PATCH 078/137] Update to 2020. Rebuild with new gprbuild --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 98b31f9..0390bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xmlada-gpl-2017-src.tar.gz /xmlada-gpl-2018-20180524-src.tar.gz /xmlada-2019-20190429-19B9D-src.tar.gz +/xmlada-2020-20200429-19A99-src.tar.gz diff --git a/sources b/sources index e00e549..5defdf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-2019-20190429-19B9D-src.tar.gz) = f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 +SHA512 (xmlada-2020-20200429-19A99-src.tar.gz) = e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c diff --git a/xmlada.spec b/xmlada.spec index 77f0a13..c6e9607 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -5,14 +5,14 @@ ## gcc-gnat package Name: xmlada -Version: 2019 -Release: 4%{?dist} +Version: 2020 +Release: 1%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com ## Direct download link is unavailable ## http://libre.adacore.com/libre/download/ -Source0: xmlada-2019-20190429-19B9D-src.tar.gz +Source0: xmlada-2020-20200429-19A99-src.tar.gz ## Fedora-specific Patch2: %{name}-2016-gprinstall.patch @@ -68,7 +68,7 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-2019-20190429-19B9D-src +%setup -q -n xmlada-2020-20200429-19A99-src %build %ifnarch %{bootstrap_arch} @@ -162,6 +162,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Dec 8 2020 Pavel Zhukov - 2020-1 +- New version v2020 + * Mon Dec 07 2020 Jeff Law - 2019-4 - Gcc 11 bootstrap From 57f3e0d6e30c9283e02993304a12154954fba917 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 8 Dec 2020 08:51:59 +0100 Subject: [PATCH 079/137] Disable gprbuild's bootstrapping --- xmlada.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index c6e9607..8dc8314 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,12 +1,13 @@ ### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch %{GPRbuild_arches} +%global bootstrap_arch no_bootstraping + ## Set this variable to %{GPRbuild_arches} for bootraping of ## gprbuild on new architecture or in case of new magor verion of ## gcc-gnat package Name: xmlada Version: 2020 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -162,6 +163,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Dec 8 2020 Pavel Zhukov - 2020-2 +- Disable gprbuild's bootstraping + * Tue Dec 8 2020 Pavel Zhukov - 2020-1 - New version v2020 From 0ec7b710332eef345b106dd675870a8f43890b14 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Mon, 21 Dec 2020 08:55:22 +0100 Subject: [PATCH 080/137] Rebuild. Ali invalidated by gcc update --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 8dc8314..2256eca 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -163,6 +163,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Mon Dec 21 2020 Pavel Zhukov - 2020-3 +- Rebuild. Ali files invalidated by gcc update + * Tue Dec 8 2020 Pavel Zhukov - 2020-2 - Disable gprbuild's bootstraping From 4ba9dd15ad7d656a420ebaacb92db90a645cb84a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:51:33 +0000 Subject: [PATCH 081/137] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmlada.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmlada.spec b/xmlada.spec index 2256eca..a4f055f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -19,6 +19,7 @@ Patch2: %{name}-2016-gprinstall.patch +BuildRequires: make %ifnarch %{bootstrap_arch} BuildRequires: gprbuild > 2018-10 BuildRequires: gcc-gnat From 453aa8e501031df2b208051c2857b525212e9411 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:09:16 +0000 Subject: [PATCH 082/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a4f055f..7da01bc 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -164,6 +164,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2020-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Pavel Zhukov - 2020-3 - Rebuild. Ali files invalidated by gcc update From 6b4e8226ae31876282497d0487dcc58375de83c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 10 Jul 2021 18:47:55 +0200 Subject: [PATCH 083/137] Removed the explicit check-rpaths invocation as that is done automatically now. --- xmlada.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 7da01bc..8c13c94 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -119,11 +119,6 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif -%check -## Verify that there are no runpaths in the compiled libraries. -%{_rpmconfigdir}/check-rpaths - - %files %license COPYING* %doc README.md TODO AUTHORS From 4e49beaa56d05722261d0e1c8015229a239f7288 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:42:40 +0000 Subject: [PATCH 084/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 8c13c94..6da348a 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2020-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2020-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 32743f612e9b0294c38d7d9336bedd934db0df02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 16 Jan 2022 19:38:19 +0100 Subject: [PATCH 085/137] Rebuilt with GCC 12 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 6da348a..36645e6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sun Jan 16 2022 Björn Persson - 2020-6 +- Rebuilt with GCC 12 prerelease. + * Fri Jul 23 2021 Fedora Release Engineering - 2020-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e8387d453aeec060e37d3d8610653fdec3f9235d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:15:10 +0000 Subject: [PATCH 086/137] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 36645e6..d95800c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2020-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jan 16 2022 Björn Persson - 2020-6 - Rebuilt with GCC 12 prerelease. From 40f5be73c82cedf1e47f1c24f48e7a090e35e03b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:17:04 +0000 Subject: [PATCH 087/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index d95800c..ae5c05f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2020-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2020-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6ea8b9a57537ba7f91db255b5218f61610460aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 17 Jan 2023 16:10:21 +0100 Subject: [PATCH 088/137] Rebuilt with GCC 13. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index ae5c05f..4e42cfe 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 8%{?dist} +Release: 9%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Tue Jan 17 2023 Björn Persson - 2020-9 +- Rebuilt with GCC 13. + * Sat Jul 23 2022 Fedora Release Engineering - 2020-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 829b43068b9fea13837fa6b2c137b1da4ba3c435 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:37:16 +0000 Subject: [PATCH 089/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 4e42cfe..3e832c9 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -7,7 +7,7 @@ Name: xmlada Version: 2020 -Release: 9%{?dist} +Release: 10%{?dist} Summary: XML library for Ada License: GPLv3+ URL: http://libre.adacore.com @@ -159,6 +159,9 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2020-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 17 2023 Björn Persson - 2020-9 - Rebuilt with GCC 13. From b3fe68424ef69d8f90c8e679bf42f848b243ecb2 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 4 Oct 2022 19:37:36 +0200 Subject: [PATCH 090/137] Update to v22.0.0, update the epoch. --- .gitignore | 1 + sources | 2 +- xmlada-gprinstall-relocate-artifacts.patch | 34 +++++ xmlada.spec | 138 +++++++++++++-------- 4 files changed, 119 insertions(+), 56 deletions(-) create mode 100644 xmlada-gprinstall-relocate-artifacts.patch diff --git a/.gitignore b/.gitignore index 0390bb6..5784613 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xmlada-gpl-2018-20180524-src.tar.gz /xmlada-2019-20190429-19B9D-src.tar.gz /xmlada-2020-20200429-19A99-src.tar.gz +/xmlada-22.0.0.tar.gz diff --git a/sources b/sources index 5defdf1..c48183b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-2020-20200429-19A99-src.tar.gz) = e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c +SHA512 (xmlada-22.0.0.tar.gz) = 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e \ No newline at end of file diff --git a/xmlada-gprinstall-relocate-artifacts.patch b/xmlada-gprinstall-relocate-artifacts.patch new file mode 100644 index 0000000..e929ef1 --- /dev/null +++ b/xmlada-gprinstall-relocate-artifacts.patch @@ -0,0 +1,34 @@ +--- a/input_sources/xmlada_input.gpr ++++ b/input_sources/xmlada_input.gpr +@@ -39,13 +39,24 @@ + package Ide renames XmlAda_Shared.Ide; + + package Install is +- for Artifacts ("share/doc/xmlada") +- use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); +- for Artifacts ("share/gpr") use ("../distrib/xmlada.gpr"); +- for Artifacts ("share/examples/xmlada/dom") use ("../docs/dom/*"); +- for Artifacts ("share/examples/xmlada/sax") use ("../docs/sax/*"); +- for Artifacts ("share/examples/xmlada/schema") use ("../docs/schema/*"); +- for Artifacts ("share/examples/xmlada/cross") use ("../docs/cross/*"); ++ ++ for Artifacts ("share/doc/xmlada/html/") ++ use ("../docs/_build/html/**"); ++ for Artifacts ("share/doc/xmlada/pdf/") ++ use ("../docs/_build/latex/XMLAda.pdf"); ++ ++ for Artifacts ("share/gpr/") ++ use ("../distrib/xmlada.gpr"); ++ ++ for Artifacts ("share/doc/xmlada/examples/dom/") ++ use ("../docs/dom/*"); ++ for Artifacts ("share/doc/xmlada/examples/sax/") ++ use ("../docs/sax/*"); ++ for Artifacts ("share/doc/xmlada/examples/schema/") ++ use ("../docs/schema/*"); ++ for Artifacts ("share/doc/xmlada/examples/cross/") ++ use ("../docs/cross/*"); ++ + end Install; + + end XmlAda_Input; diff --git a/xmlada.spec b/xmlada.spec index 3e832c9..211d641 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,31 +1,40 @@ -### global bootstrap_arch %{GPRbuild_arches} -%global bootstrap_arch no_bootstraping +# Set this variable to %GPRbuild_arches for bootstrapping of +# gprbuild on new architecture or in case of new major version of +# the gcc-gnat package. +%global bootstrap_arch no_bootstrapping +#global bootstrap_arch %GPRbuild_arches -## Set this variable to %{GPRbuild_arches} for bootraping of -## gprbuild on new architecture or in case of new magor verion of -## gcc-gnat package +# Upstream source information. +%global upstream_owner AdaCore +%global upstream_name xmlada +%global upstream_version 22.0.0 +%global upstream_gittag v%{upstream_version} Name: xmlada -Version: 2020 -Release: 10%{?dist} +Epoch: 2 +Version: %{upstream_version} +Release: 1%{?dist} Summary: XML library for Ada -License: GPLv3+ -URL: http://libre.adacore.com -## Direct download link is unavailable -## http://libre.adacore.com/libre/download/ -Source0: xmlada-2020-20200429-19A99-src.tar.gz -## Fedora-specific -Patch2: %{name}-2016-gprinstall.patch +License: GPLv3+ with exceptions +URL: https://github.com/%{upstream_owner}/%{upstream_name} +Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz -BuildRequires: make +# [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. +Patch: %{name}-gprinstall-relocate-artifacts.patch + +BuildRequires: make %ifnarch %{bootstrap_arch} BuildRequires: gprbuild > 2018-10 BuildRequires: gcc-gnat -BuildRequires: fedora-gnat-project-common >= 2 +BuildRequires: fedora-gnat-project-common +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx-latex +BuildRequires: latexmk %endif +# Build only on architectures where GPRbuild is available. ExclusiveArch: %{GPRbuild_arches} @@ -36,10 +45,11 @@ and an almost complete support for the core part of the DOM. It includes support for validating XML files with XML schemas. %ifnarch %{bootstrap_arch} + %package devel Summary: XML library for Ada devel package -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: fedora-gnat-project-common >= 2 +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: fedora-gnat-project-common %description devel Xml library for ada devel package. @@ -47,7 +57,7 @@ Xml library for ada devel package. %package static Summary: XML library for Ada, static libraries -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} %description static This package contains the XML/Ada libraries for static linking. It is needed @@ -59,6 +69,8 @@ possible. %else +# When bootstrapping gprbuild, only a package that contains source code is +# produced, so a debug package is not needed. %global debug_package %{nil} %package sources @@ -70,24 +82,39 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %endif %prep -%setup -q -n xmlada-2020-20200429-19A99-src +%autosetup -p1 + +# Set version number. +sed --in-place --expression 's/18.0w/%{version}/' configure configure.in %build %ifnarch %{bootstrap_arch} -%configure --disable-rpath --enable-shared --disable-static --enable-build=distrib -make shared static GPROPTS="%{Gnatmake_optflags}" prefix=%{buildroot}/%{_prefix} +%configure --enable-build=distrib --enable-shared + +# Build the libraries. +%{make_build} shared static GPROPTS='%{GPRbuild_flags}' + +# Make the documentation. +make -C docs html latexpdf + %else -%configure --enable-static --enable-build=distrib +%{configure} --enable-build=distrib + %endif %install %ifnarch %{bootstrap_arch} -###export GPRINSTALL_OPTS="--build-name=relocatable --lib-subdir=%{buildroot}/%{_libdir}/%{name} --link-lib-subdir=%{buildroot}/%{_libdir} --sources-subdir=%{buildroot}/%{_includedir}/%{name}" -export GPRINSTALL_OPTS="--lib-subdir=%{buildroot}/%{_libdir} --link-lib-subdir=%{buildroot}/%{_libdir}" -## Install the shared libraries first and then the static ones, because -## apparently the variant that gprinstall sees first becomes the default in the -## project files. -make install-relocatable install-static prefix=%{buildroot}/%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" PSUB="share/gpr" + +export GPRINSTALL_OPTS="--no-manifest \ + --ali-subdir=%{buildroot}%{_libdir} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir}" + +# Install the shared libraries first and then the static ones, because +# apparently the variant that gprinstall sees first becomes the default in the +# project files. +make install-relocatable install-static \ + prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; @@ -99,29 +126,21 @@ install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ ## 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/* -## These Sphinx-generated files aren't needed in the package: -rm %{buildroot}%{_pkgdocdir}/{.buildinfo,objects.inv} -mkdir -p %{buildroot}/%{_datarootdir}/%{name} -mv %{buildroot}/%{_datarootdir}/examples %{buildroot}/%{_datarootdir}/%{name} -## 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 apparently undocumented, but my crystal -## ball tells me that they're used when GPRinstall uninstalls or upgrades -## packages. The manifest file is therefore irrelevant in this RPM package, so -## delete it. -rm -rf %{buildroot}%{_GNAT_project_dir}/manifests %else -mkdir -p %{buildroot}/%{_includedir}/%{name}/sources -cp -r . %{buildroot}/%{_includedir}/%{name}/sources -find %{buildroot}/%{_includedir}/%{name}/sources -type f ! -name "*ad[sb]" ! -name "*gpr" -delete -find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete + +# Copy the source files. +mkdir --parents %{buildroot}%{_includedir}/%{name}/sources +cp -r . %{buildroot}%{_includedir}/%{name}/sources +find %{buildroot}%{_includedir}/%{name}/sources -type f ! -name "*ad[sb]" ! -name "*gpr" -delete +find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete + %endif %files -%license COPYING* -%doc README.md TODO AUTHORS +%license COPYING3 COPYING.RUNTIME +%doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/static @@ -133,32 +152,41 @@ find %{buildroot}/%{_includedir}/%{name}/sources -type d -empty -delete %{_libdir}/%{name}/lib%{name}*.so.* %endif - - %ifnarch %{bootstrap_arch} + %files devel %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so -%{_pkgdocdir}/*.html -%{_pkgdocdir}/searchindex.js -%{_pkgdocdir}/_sources -%{_pkgdocdir}/_static -%{_pkgdocdir}/XMLAda.pdf -%{_datarootdir}/%{name} - +%dir %{_pkgdocdir} +%{_pkgdocdir}/html +%{_pkgdocdir}/pdf +%{_pkgdocdir}/examples +# Exclude Sphinx-generated files that aren't needed in the package. +%exclude %{_pkgdocdir}/html/.buildinfo +%exclude %{_pkgdocdir}/html/objects.inv %files static %{_libdir}/%{name}/*.a %else + %files sources %{_includedir}/%{name} + %endif %changelog +* Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 +- Updated to v22.0.0, using the archive available on GitHub. +- Changed the epoch to mark the new upstream version scheme. +- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll packages. +- Updated the license, a runtime exception has now been added. +- Added new build dependencies to build the documentation with Sphinx and LaTeX. +- Examples are now located in _pkgdocdir/examples. + * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eacca052b981fd342c422a1b93fe6a24f6e517b6 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 4 Oct 2022 19:38:26 +0200 Subject: [PATCH 091/137] Change to SPDX license expressions, add Unicode license. --- xmlada.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 211d641..8ef5a3c 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -15,8 +15,11 @@ Epoch: 2 Version: %{upstream_version} Release: 1%{?dist} Summary: XML library for Ada -License: GPLv3+ with exceptions +License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 +# XML/Ada itself is licensed under GPL v3 or later with a runtime exception. The +# Unicode license is mentioned as Unicode data files were used as an input for +# generating some of XML/Ada's source code. URL: https://github.com/%{upstream_owner}/%{upstream_name} Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz @@ -186,6 +189,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated the license, a runtime exception has now been added. - Added new build dependencies to build the documentation with Sphinx and LaTeX. - Examples are now located in _pkgdocdir/examples. +- License field now contains an SPDX license expression. +- Added the Unicode license to cover all code that has been generated using Unicode data. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 841f543788793aa9528825a15c9b7c7815f15c82 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Thu, 22 Sep 2022 21:48:04 +0200 Subject: [PATCH 092/137] Remove patches that do no longer apply and/or are no longer used. Removed: - xmlada-2016-gprinstall.patch --- xmlada-2016-gprinstall.patch | 63 ------------------------------------ 1 file changed, 63 deletions(-) delete mode 100644 xmlada-2016-gprinstall.patch diff --git a/xmlada-2016-gprinstall.patch b/xmlada-2016-gprinstall.patch deleted file mode 100644 index e134248..0000000 --- a/xmlada-2016-gprinstall.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/unicode/xmlada_unicode.gpr b/unicode/xmlada_unicode.gpr -index 8a5a2ac..290cfe6 100644 ---- a/unicode/xmlada_unicode.gpr -+++ b/unicode/xmlada_unicode.gpr -@@ -37,4 +37,8 @@ project XmlAda_Unicode is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Unicode; -diff --git a/dom/xmlada_dom.gpr b/dom/xmlada_dom.gpr -index 5c156ab..f6d37f6 100644 ---- a/dom/xmlada_dom.gpr -+++ b/dom/xmlada_dom.gpr -@@ -39,4 +39,7 @@ project XmlAda_Dom is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; - end XmlAda_Dom; -diff --git a/input_sources/xmlada_input.gpr b/input_sources/xmlada_input.gpr -index 7602590..329bdad 100644 ---- a/input_sources/xmlada_input.gpr -+++ b/input_sources/xmlada_input.gpr -@@ -39,6 +39,7 @@ project XmlAda_Input is - package Ide renames Shared.Ide; - - package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; - for Artifacts ("share/doc/xmlada") - use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); - for Artifacts ("lib/gnat") use ("../distrib/xmlada.gpr"); -diff --git a/sax/xmlada_sax.gpr b/sax/xmlada_sax.gpr -index f4d74ac..c146d79 100644 ---- a/sax/xmlada_sax.gpr -+++ b/sax/xmlada_sax.gpr -@@ -39,4 +39,8 @@ project XmlAda_Sax is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Sax; -diff --git a/schema/xmlada_schema.gpr b/schema/xmlada_schema.gpr -index 4688847..62dee2f 100644 ---- a/schema/xmlada_schema.gpr -+++ b/schema/xmlada_schema.gpr -@@ -40,4 +40,8 @@ project XmlAda_Schema is - package Binder renames Shared.Binder; - package Ide renames Shared.Ide; - -+ package Install is -+ for Sources_Subdir use "./include/xmlada/" & Project'Library_Name; -+ end Install; -+ - end XmlAda_Schema; From c3763f02523b53ff0b9defb0429cf109c2d81025 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 21:38:45 +0200 Subject: [PATCH 093/137] Remove some post-install steps that are no longer required. The `xmlada-config` script and GNATstudio plugin are no longer installed and do not have to be removed. --- xmlada.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 8ef5a3c..5340202 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -122,12 +122,8 @@ make install-relocatable install-static \ ## Revoke exec permissions find %{buildroot} -name '*.gpr' -exec chmod -x {} \; find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; -## Delete old bash script (not needed now) -rm -f %{buildroot}%{_bindir}/xmlada-config + 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/* %else @@ -191,6 +187,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Examples are now located in _pkgdocdir/examples. - License field now contains an SPDX license expression. - Added the Unicode license to cover all code that has been generated using Unicode data. +- Removed some post-install steps that are no longer required. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3a00b5b5e84837805c5f3aad1a7f6d9fab44fae5 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 23:17:16 +0200 Subject: [PATCH 094/137] Build static libraries position independent (PIC). This will allow executables that will link with these libraries to be build position independent (PIE). --- xmlada.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5340202..89ca638 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -95,7 +95,7 @@ sed --in-place --expression 's/18.0w/%{version}/' configure configure.in %configure --enable-build=distrib --enable-shared # Build the libraries. -%{make_build} shared static GPROPTS='%{GPRbuild_flags}' +%{make_build} shared static-pic GPROPTS='%{GPRbuild_flags}' # Make the documentation. make -C docs html latexpdf @@ -116,7 +116,7 @@ export GPRINSTALL_OPTS="--no-manifest \ # Install the shared libraries first and then the static ones, because # apparently the variant that gprinstall sees first becomes the default in the # project files. -make install-relocatable install-static \ +make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" ## Revoke exec permissions @@ -188,6 +188,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - License field now contains an SPDX license expression. - Added the Unicode license to cover all code that has been generated using Unicode data. - Removed some post-install steps that are no longer required. +- Static libraries are now build position independent (PIC). * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ba3cdacac955d7c9397a64e04d2274790b1b3009 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 19:14:52 +0200 Subject: [PATCH 095/137] Fix permission errors in the prep step. Fix source packaging (like permissions) in the prep. section, before the build. These errors are similar to the errors that would be fixed by patches. --- xmlada.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 89ca638..bb47cf1 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -87,6 +87,10 @@ On architectures without gprbuild installs sources for gprbuild's bootstrap %prep %autosetup -p1 +# Revoke bogus exec permissions. +find . -name '*.gpr' -exec chmod -x {} \; +find docs -type f -exec chmod -x {} \; + # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -119,10 +123,6 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" -## Revoke exec permissions -find %{buildroot} -name '*.gpr' -exec chmod -x {} \; -find %{buildroot}%{_docdir} -type f -exec chmod -x {} \; - install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ rm -f %{buildroot}/%{_libdir}/%{name}/static/* @@ -189,6 +189,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Added the Unicode license to cover all code that has been generated using Unicode data. - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). +- Fix permission errors in the prep step; these are source packaging errors. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5bd98586027a08fd6c20f67dab324fb9dd08b70a Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 22:07:16 +0200 Subject: [PATCH 096/137] Update package summaries and descriptions. --- xmlada.spec | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index bb47cf1..7da50f7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -41,28 +41,33 @@ BuildRequires: latexmk ExclusiveArch: %{GPRbuild_arches} -%description -XML/Ada includes support for parsing XML files, including DTDs, -full support for SAX, -and an almost complete support for the core part of the DOM. -It includes support for validating XML files with XML schemas. +%global common_description_en \ +XML/Ada includes support for parsing XML files, including DTDs, full support for \ +SAX, and an almost complete support for the core part of the DOM. It includes \ +support for validating XML files with XML schemas. + +%description %{common_description_en} + %ifnarch %{bootstrap_arch} %package devel -Summary: XML library for Ada devel package +Summary: Development files for the XML/Ada library Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: fedora-gnat-project-common -%description devel -Xml library for ada devel package. +%description devel %{common_description_en} + +This package contains source code and linking information for developing +applications that use the XML/Ada library. %package static -Summary: XML library for Ada, static libraries +Summary: Static libraries of XML/Ada Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} -%description static +%description static %{common_description_en} + 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. @@ -77,10 +82,12 @@ possible. %global debug_package %{nil} %package sources -Summary: Source of XMLada for bootstrapping +Summary: Sources of the XML/Ada library (for bootstrapping GPRbuild) -%description sources -On architectures without gprbuild installs sources for gprbuild's bootstrap +%description sources %{common_description_en} + +This package contains source code for bootstrapping GPRbuild on architectures +on which GPRbuild is not yet available. %endif @@ -190,6 +197,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. +- Updated some summaries and descriptions. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ff45d19520de60f808d6b0ae0c82088c1f2260bf Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 24 Sep 2022 13:42:09 +0200 Subject: [PATCH 097/137] Improve spec file readability. --- xmlada.spec | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 7da50f7..86d9a66 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -49,6 +49,10 @@ support for validating XML files with XML schemas. %description %{common_description_en} +################# +## Subpackages ## +################# + %ifnarch %{bootstrap_arch} %package devel @@ -91,6 +95,11 @@ on which GPRbuild is not yet available. %endif + +############# +## Prepare ## +############# + %prep %autosetup -p1 @@ -101,6 +110,11 @@ find docs -type f -exec chmod -x {} \; # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in + +########### +## Build ## +########### + %build %ifnarch %{bootstrap_arch} %configure --enable-build=distrib --enable-shared @@ -116,6 +130,11 @@ make -C docs html latexpdf %endif + +############# +## Install ## +############# + %install %ifnarch %{bootstrap_arch} @@ -144,6 +163,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %endif +########### +## Files ## +########### + %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS @@ -184,6 +207,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %endif + +############### +## Changelog ## +############### + %changelog * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. @@ -198,6 +226,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. - Updated some summaries and descriptions. +- Improved spec file readability. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f0f6f19dc6e591672bf394c9d0379d697ceb77cb Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 22 Oct 2022 01:40:35 +0200 Subject: [PATCH 098/137] Fix whitespace issues. --- xmlada.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 86d9a66..b0be708 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -366,7 +366,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete * Sun Mar 15 2015 Pavel Zhukov - 2013-10 - Create unversioned symlinks - + * Sat Feb 14 2015 Pavel Zhukov - 2013-9 - Rebuild with new gcc 4.9 @@ -383,7 +383,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - aarch64 now has Ada * Sun Apr 20 2014 Pavel Zhukov - 2013-4 -- Rebuild for new gcc +- Rebuild for new gcc * Sun Aug 04 2013 Fedora Release Engineering - 2013-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 94b0038caea5db46c0c7e98e260307f20439d3e2 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 19 Sep 2022 23:41:02 +0200 Subject: [PATCH 099/137] Mark the source package as architecture independent. --- xmlada.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index b0be708..9c3342f 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -87,6 +87,7 @@ possible. %package sources Summary: Sources of the XML/Ada library (for bootstrapping GPRbuild) +BuildArch: noarch %description sources %{common_description_en} @@ -227,6 +228,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Fix permission errors in the prep step; these are source packaging errors. - Updated some summaries and descriptions. - Improved spec file readability. +- Marked the source package as architecture independent. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1b16adc0b82174637c5e1f40ca1112088d01e0e7 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:01:17 +0200 Subject: [PATCH 100/137] Remove empty directory _libdir/static; it seems to have no purpose. --- xmlada.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 9c3342f..3bbc14d 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -150,9 +150,6 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" -install -d -m 0755 %{buildroot}/%{_libdir}/%{name}/static/ -rm -f %{buildroot}/%{_libdir}/%{name}/static/* - %else # Copy the source files. @@ -173,7 +170,6 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/static %{_libdir}/lib%{name}_dom.so.* %{_libdir}/lib%{name}_input_sources.so.* %{_libdir}/lib%{name}_schema.so.* @@ -229,6 +225,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated some summaries and descriptions. - Improved spec file readability. - Marked the source package as architecture independent. +- Removed empty directory '_libdir/static'; it seems to have no purpose. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c0565fde4b9f8d0ea578cb6e827f7667ccab3382 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:27:38 +0200 Subject: [PATCH 101/137] Move libraries, fixup the symlinks for the shared libraries. --- xmlada.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 3bbc14d..e83fdce 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -150,6 +150,18 @@ export GPRINSTALL_OPTS="--no-manifest \ make install-relocatable install-static-pic \ prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" +# Remove all symbolic links in libdir/ and move the libraries from +# libdir/xmlada to libdir/ itself. +rm %{buildroot}%{_libdir}/*.so* +mv %{buildroot}%{_libdir}/%{name}/*.so* %{buildroot}%{_libdir} +mv %{buildroot}%{_libdir}/%{name}/*.a %{buildroot}%{_libdir} + +# Fix up the symbolic links for the shared libraries. +for component in dom input_sources schema unicode sax ; do + ln --symbolic --force lib%{name}_${component}.so.%{version} \ + %{buildroot}%{_libdir}/lib%{name}_${component}.so +done + %else # Copy the source files. @@ -169,13 +181,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS %ifnarch %{bootstrap_arch} -%dir %{_libdir}/%{name} -%{_libdir}/lib%{name}_dom.so.* -%{_libdir}/lib%{name}_input_sources.so.* -%{_libdir}/lib%{name}_schema.so.* -%{_libdir}/lib%{name}_unicode.so.* -%{_libdir}/lib%{name}_sax.so.* -%{_libdir}/%{name}/lib%{name}*.so.* +%{_libdir}/lib%{name}_dom.so.%{version} +%{_libdir}/lib%{name}_input_sources.so.%{version} +%{_libdir}/lib%{name}_schema.so.%{version} +%{_libdir}/lib%{name}_unicode.so.%{version} +%{_libdir}/lib%{name}_sax.so.%{version} %endif %ifnarch %{bootstrap_arch} @@ -183,8 +193,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files devel %{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr +%dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali -%{_libdir}/%{name}/lib%{name}*.so %{_libdir}/lib%{name}*.so %dir %{_pkgdocdir} %{_pkgdocdir}/html @@ -195,7 +205,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %exclude %{_pkgdocdir}/html/objects.inv %files static -%{_libdir}/%{name}/*.a +%{_libdir}/lib%{name}*.a %else @@ -226,6 +236,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Improved spec file readability. - Marked the source package as architecture independent. - Removed empty directory '_libdir/static'; it seems to have no purpose. +- Moved all libraries from '_libdir/xmlada' to '_libdir'. +- Fix up the symbolic links for the shared libraries. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From da3f6003c0f828d0460444a7d419f8eca717535d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 25 Sep 2022 10:56:12 +0200 Subject: [PATCH 102/137] Only produce an xmlada-sources package when bootstrapping. --- xmlada.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index e83fdce..2f4a075 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -177,18 +177,16 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ## Files ## ########### +%ifnarch %{bootstrap_arch} + %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS -%ifnarch %{bootstrap_arch} %{_libdir}/lib%{name}_dom.so.%{version} %{_libdir}/lib%{name}_input_sources.so.%{version} %{_libdir}/lib%{name}_schema.so.%{version} %{_libdir}/lib%{name}_unicode.so.%{version} %{_libdir}/lib%{name}_sax.so.%{version} -%endif - -%ifnarch %{bootstrap_arch} %files devel %{_includedir}/%{name} From 6ad095e706ac94935e60bf6230d0740e738a1cc5 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:40:31 +0200 Subject: [PATCH 103/137] Move documentation and examples into a separate package. --- xmlada.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 2f4a075..4a30c75 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -59,6 +59,7 @@ support for validating XML files with XML schemas. Summary: Development files for the XML/Ada library Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: fedora-gnat-project-common +Recommends: %{name}-doc %description devel %{common_description_en} @@ -79,6 +80,19 @@ libraries are upgraded. Other Fedora packages shall require xmlada-devel rather than xmlada-static if possible. + +%package doc +Summary: Documentation for the XML/Ada library +BuildArch: noarch +License: AdaCore-doc AND MIT AND BSD-2-Clause +# License for the documentation is AdaCore-doc. The Javascript and CSS files +# that Sphinx includes with the documentation are BSD 2-Clause and MIT-licensed. + +%description doc %{common_description_en} + +This package contains the documentation in HTML and PDF, and some examples. + + %else # When bootstrapping gprbuild, only a package that contains source code is @@ -194,6 +208,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/lib%{name}*.so + +%files static +%{_libdir}/lib%{name}*.a + +%files doc %dir %{_pkgdocdir} %{_pkgdocdir}/html %{_pkgdocdir}/pdf @@ -202,9 +221,6 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %exclude %{_pkgdocdir}/html/.buildinfo %exclude %{_pkgdocdir}/html/objects.inv -%files static -%{_libdir}/lib%{name}*.a - %else %files sources @@ -236,6 +252,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Removed empty directory '_libdir/static'; it seems to have no purpose. - Moved all libraries from '_libdir/xmlada' to '_libdir'. - Fix up the symbolic links for the shared libraries. +- Moved documentation and examples into a separate package. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9f12d033499b37dade7364ca62c8a33a84ae997d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 27 Dec 2022 16:42:36 +0100 Subject: [PATCH 104/137] Install each component separately. --- xmlada.gpr | 9 ++++++++ xmlada.spec | 59 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 xmlada.gpr diff --git a/xmlada.gpr b/xmlada.gpr new file mode 100644 index 0000000..b755c81 --- /dev/null +++ b/xmlada.gpr @@ -0,0 +1,9 @@ +with "xmlada_unicode"; +with "xmlada_sax"; +with "xmlada_input"; +with "xmlada_dom"; +with "xmlada_schema"; + +project Xmlada is + for Source_Dirs use (); +end Xmlada; diff --git a/xmlada.spec b/xmlada.spec index 4a30c75..5e376a6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -24,6 +24,11 @@ License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 URL: https://github.com/%{upstream_owner}/%{upstream_name} Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz +# XML/Ada's aggregate project file. This project file is normally generated and +# installed by GPRinstall, but as we'll install each XML/Ada component +# separately, we need to maintain and install it manually. +Source1: xmlada.gpr + # [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. Patch: %{name}-gprinstall-relocate-artifacts.patch @@ -153,22 +158,40 @@ make -C docs html latexpdf %install %ifnarch %{bootstrap_arch} -export GPRINSTALL_OPTS="--no-manifest \ - --ali-subdir=%{buildroot}%{_libdir} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir}" +# Install each component. +for libtype in relocatable static-pic ; do -# Install the shared libraries first and then the static ones, because -# apparently the variant that gprinstall sees first becomes the default in the -# project files. -make install-relocatable install-static-pic \ - prefix=%{buildroot}%{_prefix} GPROPTS="${GPRINSTALL_OPTS}" + for component in dom schema unicode sax ; do + gprinstall --create-missing-dirs --no-manifest \ + --prefix=%{buildroot}%{_prefix} \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component} \ + --project-subdir=%{buildroot}%{_GNAT_project_dir} \ + --ali-subdir=%{buildroot}%{_libdir}/%{name} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir} \ + --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ + --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ + -P ${component}/%{name}_${component}.gpr + done -# Remove all symbolic links in libdir/ and move the libraries from -# libdir/xmlada to libdir/ itself. -rm %{buildroot}%{_libdir}/*.so* -mv %{buildroot}%{_libdir}/%{name}/*.so* %{buildroot}%{_libdir} -mv %{buildroot}%{_libdir}/%{name}/*.a %{buildroot}%{_libdir} + # The "input" component needs special treatment as its dirname in the source + # tree ("input_sources") is not reflected in its GNAT project file + # ("xmlada_input.gpr"). + gprinstall --create-missing-dirs --no-manifest \ + --prefix=%{buildroot}%{_prefix} \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/input \ + --project-subdir=%{buildroot}%{_GNAT_project_dir} \ + --ali-subdir=%{buildroot}%{_libdir}/%{name} \ + --lib-subdir=%{buildroot}%{_libdir} \ + --link-lib-subdir=%{buildroot}%{_libdir} \ + --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ + --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ + -P input_sources/%{name}_input.gpr +done + +# Install the aggregate project file ("xmlada.gpr"). +install --mode=u=rw,go=r,a-s --preserve-timestamps \ + %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} # Fix up the symbolic links for the shared libraries. for component in dom input_sources schema unicode sax ; do @@ -196,15 +219,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files %license COPYING3 COPYING.RUNTIME %doc README* TODO AUTHORS -%{_libdir}/lib%{name}_dom.so.%{version} -%{_libdir}/lib%{name}_input_sources.so.%{version} -%{_libdir}/lib%{name}_schema.so.%{version} -%{_libdir}/lib%{name}_unicode.so.%{version} -%{_libdir}/lib%{name}_sax.so.%{version} +%{_libdir}/lib%{name}*.so.%{version} %files devel -%{_includedir}/%{name} %{_GNAT_project_dir}/%{name}*.gpr +%{_includedir}/%{name} %dir %{_libdir}/%{name} %attr(444,-,-) %{_libdir}/%{name}/*.ali %{_libdir}/lib%{name}*.so From 140894df287a84334819bc254067233fb3c87aff Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 4 Mar 2023 13:56:12 +0100 Subject: [PATCH 105/137] Verify ALI files before installation. --- xmlada.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 5e376a6..d28faaf 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -158,6 +158,16 @@ make -C docs html latexpdf %install %ifnarch %{bootstrap_arch} +# Verify that the ALI files of both builds (relocatable and static-pic) match. +# The verfication is necessary as GPRinstall will overwrite the ALI files during +# the installation of the static-pic build (which is installed after the +# relocatable build). +for component_dir in dom schema unicode sax input_sources ; do + diff --exclude "*.a" --exclude "*.so*" --exclude ".cvsignore" \ + %{_builddir}/%{name}-%{version}/${component_dir}/lib/relocatable \ + %{_builddir}/%{name}-%{version}/${component_dir}/lib/static-pic +done + # Install each component. for libtype in relocatable static-pic ; do From 51d09c109e6f8679dc4efa8ba92a72ba95add89d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 20 Sep 2022 00:58:47 +0200 Subject: [PATCH 106/137] Make the generated project files architecture-independent. --- xmlada.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index d28faaf..80977d4 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -34,8 +34,7 @@ Patch: %{name}-gprinstall-relocate-artifacts.patch BuildRequires: make %ifnarch %{bootstrap_arch} -BuildRequires: gprbuild > 2018-10 -BuildRequires: gcc-gnat +BuildRequires: gcc-gnat gprbuild sed BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex @@ -209,6 +208,26 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done +# Make the generated project files architecture-independent. +for component in dom input schema unicode sax ; do + 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}/${component}'");|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}/%{name}_${component}.gpr + # The Sed commands are: + # 1: Insert a with clause before the first line to import the directories + # project. + # 2: Delete a comment that mentions the architecture. + # 3: Replace the value of Source_Dirs with a pathname based on + # Directories.Includedir. + # 4: Replace the value of Library_Dir with Directories.Libdir. + # 5: Replace the value of Library_ALI_Dir with a pathname based on + # Directories.Libdir. +done + %else # Copy the source files. @@ -282,6 +301,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Moved all libraries from '_libdir/xmlada' to '_libdir'. - Fix up the symbolic links for the shared libraries. - Moved documentation and examples into a separate package. +- Made the generated project files architecture-independent. +- Added a build dependency on sed, removed the explicit version dependency on GPRbuild. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f10937164fe0b8592caabaf26137a00ef48ee8f8 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 11 Oct 2022 18:51:44 +0200 Subject: [PATCH 107/137] Update comment on building in bootstrap mode. --- xmlada.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 80977d4..5b2903a 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,6 +1,12 @@ -# Set this variable to %GPRbuild_arches for bootstrapping of -# gprbuild on new architecture or in case of new major version of -# the gcc-gnat package. +# To build this package in bootstrap mode, set variable `bootstrap_arch` to +# `%GPRbuild_arches`. To build this package in normal mode, set `bootstrap_arch` +# to any value other than a well-known architecture name. Do not leave the +# `bootstrap_arch` variable empty as this will make the spec syntactically +# invalid. +# +# For more information on building in bootstrap mode, see the `gprbuild` +# spec-file. +# %global bootstrap_arch no_bootstrapping #global bootstrap_arch %GPRbuild_arches @@ -44,7 +50,6 @@ BuildRequires: latexmk # Build only on architectures where GPRbuild is available. ExclusiveArch: %{GPRbuild_arches} - %global common_description_en \ XML/Ada includes support for parsing XML files, including DTDs, full support for \ SAX, and an almost complete support for the core part of the DOM. It includes \ From 3b7fb2087885cf67d13f55d132bdf60ab33d353f Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sat, 22 Oct 2022 00:26:16 +0200 Subject: [PATCH 108/137] Use a configuration option to enable bootstrap build mode. --- xmlada.spec | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5b2903a..4e40704 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,14 +1,7 @@ -# To build this package in bootstrap mode, set variable `bootstrap_arch` to -# `%GPRbuild_arches`. To build this package in normal mode, set `bootstrap_arch` -# to any value other than a well-known architecture name. Do not leave the -# `bootstrap_arch` variable empty as this will make the spec syntactically -# invalid. -# -# For more information on building in bootstrap mode, see the `gprbuild` -# spec-file. -# -%global bootstrap_arch no_bootstrapping -#global bootstrap_arch %GPRbuild_arches +# This package has a bootstrap build mode that can be used to create a source +# code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more +# information. +%bcond_with bootstrap # Upstream source information. %global upstream_owner AdaCore @@ -39,7 +32,7 @@ Source1: xmlada.gpr Patch: %{name}-gprinstall-relocate-artifacts.patch BuildRequires: make -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx @@ -62,7 +55,7 @@ support for validating XML files with XML schemas. ## Subpackages ## ################# -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %package devel Summary: Development files for the XML/Ada library @@ -140,7 +133,7 @@ sed --in-place --expression 's/18.0w/%{version}/' configure configure.in ########### %build -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %configure --enable-build=distrib --enable-shared # Build the libraries. @@ -160,7 +153,7 @@ make -C docs html latexpdf ############# %install -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} # Verify that the ALI files of both builds (relocatable and static-pic) match. # The verfication is necessary as GPRinstall will overwrite the ALI files during @@ -248,7 +241,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ## Files ## ########### -%ifnarch %{bootstrap_arch} +%if %{without bootstrap} %files %license COPYING3 COPYING.RUNTIME @@ -308,6 +301,7 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Moved documentation and examples into a separate package. - Made the generated project files architecture-independent. - Added a build dependency on sed, removed the explicit version dependency on GPRbuild. +- Bootstrap mode can now be enabled via a configuration option. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ab96e89347c1f07bc92ed545e64cbd71729f6da0 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 23 Oct 2022 16:12:32 +0200 Subject: [PATCH 109/137] Update to v23.0.0. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5784613..61a79ac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xmlada-2019-20190429-19B9D-src.tar.gz /xmlada-2020-20200429-19A99-src.tar.gz /xmlada-22.0.0.tar.gz +/xmlada-23.0.0.tar.gz diff --git a/sources b/sources index c48183b..ab000ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-22.0.0.tar.gz) = 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e \ No newline at end of file +SHA512 (xmlada-23.0.0.tar.gz) = a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb \ No newline at end of file diff --git a/xmlada.spec b/xmlada.spec index 4e40704..81846ce 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,7 +6,7 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 22.0.0 +%global upstream_version 23.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada @@ -120,10 +120,6 @@ on which GPRbuild is not yet available. %prep %autosetup -p1 -# Revoke bogus exec permissions. -find . -name '*.gpr' -exec chmod -x {} \; -find docs -type f -exec chmod -x {} \; - # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -280,6 +276,11 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Feb 14 2023 Dennis van Raaij - 2:23.0.0-1 +- Updated to v23.0.0, using the archive available on GitHub. +- Removed backport patch for improved Unicode support. +- Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). + * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. - Changed the epoch to mark the new upstream version scheme. From cea137f38261d3af035b2b7d334fe22893492711 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 10 Mar 2023 21:30:57 +0100 Subject: [PATCH 110/137] Move documentation back to where it was and move examples manually. --- xmlada-gprinstall-relocate-artifacts.patch | 34 ---------------------- xmlada.spec | 25 +++++++++++----- 2 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 xmlada-gprinstall-relocate-artifacts.patch diff --git a/xmlada-gprinstall-relocate-artifacts.patch b/xmlada-gprinstall-relocate-artifacts.patch deleted file mode 100644 index e929ef1..0000000 --- a/xmlada-gprinstall-relocate-artifacts.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/input_sources/xmlada_input.gpr -+++ b/input_sources/xmlada_input.gpr -@@ -39,13 +39,24 @@ - package Ide renames XmlAda_Shared.Ide; - - package Install is -- for Artifacts ("share/doc/xmlada") -- use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf"); -- for Artifacts ("share/gpr") use ("../distrib/xmlada.gpr"); -- for Artifacts ("share/examples/xmlada/dom") use ("../docs/dom/*"); -- for Artifacts ("share/examples/xmlada/sax") use ("../docs/sax/*"); -- for Artifacts ("share/examples/xmlada/schema") use ("../docs/schema/*"); -- for Artifacts ("share/examples/xmlada/cross") use ("../docs/cross/*"); -+ -+ for Artifacts ("share/doc/xmlada/html/") -+ use ("../docs/_build/html/**"); -+ for Artifacts ("share/doc/xmlada/pdf/") -+ use ("../docs/_build/latex/XMLAda.pdf"); -+ -+ for Artifacts ("share/gpr/") -+ use ("../distrib/xmlada.gpr"); -+ -+ for Artifacts ("share/doc/xmlada/examples/dom/") -+ use ("../docs/dom/*"); -+ for Artifacts ("share/doc/xmlada/examples/sax/") -+ use ("../docs/sax/*"); -+ for Artifacts ("share/doc/xmlada/examples/schema/") -+ use ("../docs/schema/*"); -+ for Artifacts ("share/doc/xmlada/examples/cross/") -+ use ("../docs/cross/*"); -+ - end Install; - - end XmlAda_Input; diff --git a/xmlada.spec b/xmlada.spec index 81846ce..a8f09f0 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -28,9 +28,6 @@ Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_ve # separately, we need to maintain and install it manually. Source1: xmlada.gpr -# [Fedora specific] Copy artifacts (docs, examples, etc.) to the correct location. -Patch: %{name}-gprinstall-relocate-artifacts.patch - BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed @@ -202,6 +199,15 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done +# Move examples to the _pkgdocdir and remove the remaining empty directories. +mkdir %{buildroot}%{_pkgdocdir}/examples + +mv %{buildroot}%{_datadir}/examples/%{name}/* \ + %{buildroot}%{_pkgdocdir}/examples/ + +rmdir %{buildroot}%{_datadir}/examples/%{name} +rmdir %{buildroot}%{_datadir}/examples + # Make the generated project files architecture-independent. for component in dom input schema unicode sax ; do sed --regexp-extended --in-place \ @@ -256,12 +262,15 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete %files doc %dir %{_pkgdocdir} -%{_pkgdocdir}/html -%{_pkgdocdir}/pdf +%{_pkgdocdir}/*.html +%{_pkgdocdir}/searchindex.js +%{_pkgdocdir}/_sources +%{_pkgdocdir}/_static +%{_pkgdocdir}/XMLAda.pdf %{_pkgdocdir}/examples # Exclude Sphinx-generated files that aren't needed in the package. -%exclude %{_pkgdocdir}/html/.buildinfo -%exclude %{_pkgdocdir}/html/objects.inv +%exclude %{_pkgdocdir}/.buildinfo +%exclude %{_pkgdocdir}/objects.inv %else @@ -280,6 +289,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. - Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). +- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files manually after install. +- Moved the documentation back to where is was until version 2:22.0.0. * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. From e2897d15b65a76fab2b117159d25c03890da6fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:17:49 +0100 Subject: [PATCH 111/137] Simplified the install section a bit. --- xmlada.spec | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index a8f09f0..65c92cd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -159,34 +159,31 @@ for component_dir in dom schema unicode sax input_sources ; do done # Install each component. -for libtype in relocatable static-pic ; do - - for component in dom schema unicode sax ; do - gprinstall --create-missing-dirs --no-manifest \ - --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component} \ - --project-subdir=%{buildroot}%{_GNAT_project_dir} \ - --ali-subdir=%{buildroot}%{_libdir}/%{name} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir} \ - --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ - --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ - -P ${component}/%{name}_${component}.gpr - done - - # The "input" component needs special treatment as its dirname in the source - # tree ("input_sources") is not reflected in its GNAT project file - # ("xmlada_input.gpr"). +function run_gprinstall { + local libtype=$1 + local component=$2 + local directory=$3 # directory name in the source tree gprinstall --create-missing-dirs --no-manifest \ --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/input \ + --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component}\ --project-subdir=%{buildroot}%{_GNAT_project_dir} \ --ali-subdir=%{buildroot}%{_libdir}/%{name} \ --lib-subdir=%{buildroot}%{_libdir} \ --link-lib-subdir=%{buildroot}%{_libdir} \ --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ - -P input_sources/%{name}_input.gpr + -P ${directory}/%{name}_${component}.gpr +} + +for libtype in relocatable static-pic ; do + for component in dom schema unicode sax ; do + run_gprinstall ${libtype} ${component} ${component} + done + + # The "input" component needs special treatment as its dirname in the source + # tree ("input_sources") is not reflected in its GNAT project file + # ("xmlada_input.gpr"). + run_gprinstall ${libtype} input input_sources done # Install the aggregate project file ("xmlada.gpr"). @@ -199,13 +196,10 @@ for component in dom input_sources schema unicode sax ; do %{buildroot}%{_libdir}/lib%{name}_${component}.so done -# Move examples to the _pkgdocdir and remove the remaining empty directories. -mkdir %{buildroot}%{_pkgdocdir}/examples +# Move examples to the _pkgdocdir and remove the remaining empty directory. +mv --no-target-directory %{buildroot}%{_datadir}/examples/%{name} \ + %{buildroot}%{_pkgdocdir}/examples -mv %{buildroot}%{_datadir}/examples/%{name}/* \ - %{buildroot}%{_pkgdocdir}/examples/ - -rmdir %{buildroot}%{_datadir}/examples/%{name} rmdir %{buildroot}%{_datadir}/examples # Make the generated project files architecture-independent. From faf81443c691a4b6ca50721820f88c4e0fb0c3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:23:52 +0100 Subject: [PATCH 112/137] wording correction What a computer does is not done "manually". --- xmlada.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 65c92cd..5975680 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -283,7 +283,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. - Removed fix for file permissions; has been fixed upstream (commit: 9e1bd23). -- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files manually after install. +- Removed patch gprbuild-gprinstall-relocate-artifacts.patch; move files after + GPRinstall has run. - Moved the documentation back to where is was until version 2:22.0.0. * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 From 5ace0f0729400e1be01c5f475791c10cf93faa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:26:08 +0100 Subject: [PATCH 113/137] formatting --- xmlada.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 5975680..53e98f7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -188,7 +188,7 @@ done # Install the aggregate project file ("xmlada.gpr"). install --mode=u=rw,go=r,a-s --preserve-timestamps \ - %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} + %{SOURCE1} --target-directory=%{buildroot}%{_GNAT_project_dir} # Fix up the symbolic links for the shared libraries. for component in dom input_sources schema unicode sax ; do @@ -290,12 +290,14 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete * Sun Feb 12 2023 Dennis van Raaij - 2:22.0.0-1 - Updated to v22.0.0, using the archive available on GitHub. - Changed the epoch to mark the new upstream version scheme. -- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll packages. +- Changed the epoch to 2 instead of 1 for consistency with the GNATcoll + packages. - Updated the license, a runtime exception has now been added. - Added new build dependencies to build the documentation with Sphinx and LaTeX. - Examples are now located in _pkgdocdir/examples. - License field now contains an SPDX license expression. -- Added the Unicode license to cover all code that has been generated using Unicode data. +- Added the Unicode license to cover all code that has been generated using + Unicode data. - Removed some post-install steps that are no longer required. - Static libraries are now build position independent (PIC). - Fix permission errors in the prep step; these are source packaging errors. @@ -307,7 +309,8 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete - Fix up the symbolic links for the shared libraries. - Moved documentation and examples into a separate package. - Made the generated project files architecture-independent. -- Added a build dependency on sed, removed the explicit version dependency on GPRbuild. +- Added a build dependency on sed, removed the explicit version dependency on + GPRbuild. - Bootstrap mode can now be enabled via a configuration option. * Sat Jan 21 2023 Fedora Release Engineering - 2020-10 From 47eda5202f25395fa8f069b587d478cbaca60ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Mar 2023 19:51:37 +0100 Subject: [PATCH 114/137] Using GPRbuild_flags requires a very new fedora-gnat-project-common. --- xmlada.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 53e98f7..43e0ad8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -31,7 +31,8 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -BuildRequires: fedora-gnat-project-common +# A fedora-gnat-project-common that contains GPRbuild_flags is needed. +BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex BuildRequires: latexmk @@ -279,6 +280,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Mon Mar 13 2023 Björn Persson - 2:23.0.0-2 +- Set a minimum version of fedora-gnat-project-common. +- Simplified the install section a bit. + * Tue Feb 14 2023 Dennis van Raaij - 2:23.0.0-1 - Updated to v23.0.0, using the archive available on GitHub. - Removed backport patch for improved Unicode support. From 6800935a2bcbef8c6c2cea427c3e8307b84b1a5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:01:15 +0000 Subject: [PATCH 115/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 43e0ad8..7ec5247 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2:23.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Mar 13 2023 Björn Persson - 2:23.0.0-2 - Set a minimum version of fedora-gnat-project-common. - Simplified the install section a bit. From e8dcfc5f1349eeacb64a5420caa6db8406440e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 16 Jan 2024 11:16:40 +0100 Subject: [PATCH 116/137] Rebuilt with GCC 14 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 7ec5247..840ab5e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Jan 16 2024 Björn Persson - 2:23.0.0-4 +- Rebuilt with GCC 14 prerelease. + * Sat Jul 22 2023 Fedora Release Engineering - 2:23.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 35e4b1c293bf8f29169eb5b3251309b73d6d5873 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:52:15 +0000 Subject: [PATCH 117/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 840ab5e..5267f60 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -280,6 +280,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2:23.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Björn Persson - 2:23.0.0-4 - Rebuilt with GCC 14 prerelease. From 4ff40cd1954321a8407414b3961f73c78844c5d3 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 8 Dec 2023 20:06:39 +0100 Subject: [PATCH 118/137] Update to v24.0.0. --- .gitignore | 1 + sources | 2 +- xmlada.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61a79ac..902cffe 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /xmlada-2020-20200429-19A99-src.tar.gz /xmlada-22.0.0.tar.gz /xmlada-23.0.0.tar.gz +/xmlada-24.0.0.tar.gz diff --git a/sources b/sources index ab000ed..3c545d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-23.0.0.tar.gz) = a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb \ No newline at end of file +SHA512 (xmlada-24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d \ No newline at end of file diff --git a/xmlada.spec b/xmlada.spec index 5267f60..0589eb2 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 23.0.0 +%global upstream_version 24.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -34,6 +34,7 @@ BuildRequires: gcc-gnat gprbuild sed # A fedora-gnat-project-common that contains GPRbuild_flags is needed. BuildRequires: fedora-gnat-project-common >= 3.17 BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex BuildRequires: latexmk %endif @@ -280,6 +281,10 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Jan 28 2024 Dennis van Raaij - 2:24.0.0-1 +- Updated to v24.0.0. +- Generated HTML-documentation now uses the 'Read the Docs' Sphinx theme. + * Sat Jan 27 2024 Fedora Release Engineering - 2:23.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2ae77acab81ddb41ac8ae007bc03067d943806ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Thu, 25 Apr 2024 18:02:47 +0200 Subject: [PATCH 119/137] Use the macro GPRinstall. --- xmlada.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0589eb2..e2f3bdd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -31,8 +31,8 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -# A fedora-gnat-project-common that contains GPRbuild_flags is needed. -BuildRequires: fedora-gnat-project-common >= 3.17 +# A fedora-gnat-project-common that contains the macro GPRinstall is needed. +BuildRequires: fedora-gnat-project-common >= 3.21 BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex @@ -165,13 +165,7 @@ function run_gprinstall { local libtype=$1 local component=$2 local directory=$3 # directory name in the source tree - gprinstall --create-missing-dirs --no-manifest \ - --prefix=%{buildroot}%{_prefix} \ - --sources-subdir=%{buildroot}%{_includedir}/%{name}/${component}\ - --project-subdir=%{buildroot}%{_GNAT_project_dir} \ - --ali-subdir=%{buildroot}%{_libdir}/%{name} \ - --lib-subdir=%{buildroot}%{_libdir} \ - --link-lib-subdir=%{buildroot}%{_libdir} \ + %{GPRinstall -s xmlada/${component}} \ --build-var=LIBRARY_TYPE --build-var=XMLADA_BUILD \ --build-name=${libtype} -XLIBRARY_TYPE=${libtype} \ -P ${directory}/%{name}_${component}.gpr From f0a6f1e191567fc770f3437420a8cbffb8e231bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Wed, 15 May 2024 23:33:17 +0200 Subject: [PATCH 120/137] Added a missing bootstrap dependency on findutils. --- xmlada.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index e2f3bdd..38c3bcb 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -37,6 +37,8 @@ BuildRequires: python3-sphinx BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex BuildRequires: latexmk +%else +BuildRequires: findutils %endif # Build only on architectures where GPRbuild is available. From de4407abc12ecd1d4621c3a8ad415de037457522 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:13:11 +0000 Subject: [PATCH 121/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 38c3bcb..01e88f8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2:24.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jan 28 2024 Dennis van Raaij - 2:24.0.0-1 - Updated to v24.0.0. - Generated HTML-documentation now uses the 'Read the Docs' Sphinx theme. From 0ed304da955e44fa7416705aacbc9d47772a0c22 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Fri, 25 Oct 2024 18:17:22 +0200 Subject: [PATCH 122/137] Update to v25.0.0 --- .gitignore | 1 + sources | 2 +- xmlada.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 902cffe..999a3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xmlada-22.0.0.tar.gz /xmlada-23.0.0.tar.gz /xmlada-24.0.0.tar.gz +/xmlada-25.0.0.tar.gz diff --git a/sources b/sources index 3c545d4..6c6c8aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d \ No newline at end of file +SHA512 (xmlada-25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0 diff --git a/xmlada.spec b/xmlada.spec index 01e88f8..51f74dd 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 24.0.0 +%global upstream_version 25.0.0 %global upstream_gittag v%{upstream_version} Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Oct 27 2024 Dennis van Raaij - 2:25.0.0-1 +- Updated to v25.0.0. + * Sat Jul 20 2024 Fedora Release Engineering - 2:24.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8d9e2649b0526d0aa9298eab49f6e5f10566cc10 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 23 Oct 2022 17:15:35 +0200 Subject: [PATCH 123/137] Enable bootstrapping --- xmlada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 51f74dd..32ea5a3 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,7 +1,7 @@ # This package has a bootstrap build mode that can be used to create a source # code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more # information. -%bcond_with bootstrap +%bcond_without bootstrap # Upstream source information. %global upstream_owner AdaCore From dcffa6d8f9dd3250514af12e8c5513b6748de82b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 4 Dec 2024 15:21:33 +0100 Subject: [PATCH 124/137] Disable bootstrapping This reverts commit 8d9e2649b0526d0aa9298eab49f6e5f10566cc10. --- xmlada.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 32ea5a3..104c697 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -1,7 +1,7 @@ # This package has a bootstrap build mode that can be used to create a source # code package for bootstrapping GPRbuild. See the 'gprbuild' spec file for more # information. -%bcond_without bootstrap +%bcond_with bootstrap # Upstream source information. %global upstream_owner AdaCore @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Wed Dec 04 2024 Pavel Zhukov - 2:25.0.0-2 +- Disable bootstrap + * Sun Oct 27 2024 Dennis van Raaij - 2:25.0.0-1 - Updated to v25.0.0. From f90fa89c6b6bb774f2d6a88f0461c989d8465898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Mon, 13 Jan 2025 18:15:50 +0100 Subject: [PATCH 125/137] Rebuilt with GCC 15 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 104c697..f23bcca 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Mon Jan 13 2025 Björn Persson - 2:25.0.0-3 +- Rebuilt with GCC 15 prerelease. + * Wed Dec 04 2024 Pavel Zhukov - 2:25.0.0-2 - Disable bootstrap From 12a2ad169de15d20b4eb878487f4612a35f3bfd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Wed, 15 Jan 2025 12:12:39 +0100 Subject: [PATCH 126/137] Rebuilt with another GCC 15 prerelease. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index f23bcca..ab7e41e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Wed Jan 15 2025 Björn Persson - 2:25.0.0-4 +- Rebuilt with another GCC 15 prerelease. + * Mon Jan 13 2025 Björn Persson - 2:25.0.0-3 - Rebuilt with GCC 15 prerelease. From 0bb1a50af472d42660247cc4e6a7b9a47c098a07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:00:50 +0000 Subject: [PATCH 127/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index ab7e41e..923d0b7 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2:25.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Björn Persson - 2:25.0.0-4 - Rebuilt with another GCC 15 prerelease. From c50d3f879919cc790e6bce6f152ed24ccfa554a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:55:51 +0000 Subject: [PATCH 128/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 923d0b7..16e6c38 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 5%{?dist} +Release: 6%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2:25.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2:25.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From cfec7ec92458f7f9cfc3b5560d195ae043c58884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Fri, 8 Aug 2025 20:57:35 +0200 Subject: [PATCH 129/137] Rebuilt because the ALI of System.OS_Constants changed. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 16e6c38..de5b062 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 6%{?dist} +Release: 7%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Aug 08 2025 Björn Persson - 2:25.0.0-7 +- Rebuilt because the ALI of System.OS_Constants changed. + * Fri Jul 25 2025 Fedora Release Engineering - 2:25.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 61efeea091cb11381325b170cd5cff7fba0ae548 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:56:28 +0100 Subject: [PATCH 130/137] Update to v26.0.0 --- .gitignore | 1 + sources | 2 +- xmlada.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 999a3c5..6052736 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xmlada-23.0.0.tar.gz /xmlada-24.0.0.tar.gz /xmlada-25.0.0.tar.gz +/xmlada-26.0.0.tar.gz diff --git a/sources b/sources index 6c6c8aa..313a9f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlada-25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0 +SHA512 (xmlada-26.0.0.tar.gz) = b97f7727df52229f8e76ab169f4b42b9b82b20c82555607d65455f6cb7836c83219017a45b832de38b348e595f5a68d0987e3c568293b45fc285ffdc3ec3aa01 diff --git a/xmlada.spec b/xmlada.spec index de5b062..3eedfee 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -6,13 +6,13 @@ # Upstream source information. %global upstream_owner AdaCore %global upstream_name xmlada -%global upstream_version 25.0.0 -%global upstream_gittag v%{upstream_version} +%global upstream_version 26.0.0 +%global upstream_commit 5e5b761eb827f458efd2043a5e9ab03e1a614720 Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 7%{?dist} +Release: 1%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -21,7 +21,7 @@ License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 # generating some of XML/Ada's source code. URL: https://github.com/%{upstream_owner}/%{upstream_name} -Source0: %{url}/archive/%{upstream_gittag}/%{upstream_name}-%{upstream_version}.tar.gz +Source0: %{url}/archive/%{upstream_commit}.tar.gz#/%{upstream_name}-%{upstream_version}.tar.gz # XML/Ada's aggregate project file. This project file is normally generated and # installed by GPRinstall, but as we'll install each XML/Ada component @@ -119,7 +119,7 @@ on which GPRbuild is not yet available. ############# %prep -%autosetup -p1 +%autosetup -C -p1 # Set version number. sed --in-place --expression 's/18.0w/%{version}/' configure configure.in @@ -277,6 +277,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Tue Dec 23 2025 Dennis van Raaij - 2:26.0.0-1 +- Updated to v26.0.0. + * Fri Aug 08 2025 Björn Persson - 2:25.0.0-7 - Rebuilt because the ALI of System.OS_Constants changed. From d13e0833dbf3daf7dbc86b02b1c4af61427a9089 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:56:40 +0100 Subject: [PATCH 131/137] Add missing font dependencies --- xmlada.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xmlada.spec b/xmlada.spec index 3eedfee..f5c36ff 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -90,6 +90,10 @@ BuildArch: noarch License: AdaCore-doc AND MIT AND BSD-2-Clause # License for the documentation is AdaCore-doc. The Javascript and CSS files # that Sphinx includes with the documentation are BSD 2-Clause and MIT-licensed. +Requires: font(fontawesome) +Requires: font(lato) +Requires: font(robotoslab) +# Fonts are required by the Read the Docs Sphinx theme. %description doc %{common_description_en} From 826a49879277440dcf6f4905b2988966135f40d4 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Mon, 27 Oct 2025 21:57:39 +0100 Subject: [PATCH 132/137] Remove explicit build dependency on latexmk It is included through python3-sphinx-latex. --- xmlada.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index f5c36ff..0343ee6 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -34,9 +34,8 @@ BuildRequires: gcc-gnat gprbuild sed # A fedora-gnat-project-common that contains the macro GPRinstall is needed. BuildRequires: fedora-gnat-project-common >= 3.21 BuildRequires: python3-sphinx -BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-latex -BuildRequires: latexmk +BuildRequires: python3-sphinx_rtd_theme %else BuildRequires: findutils %endif From 7b435530dede67a6ecb259a4fc884c94e213293d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 6 Jan 2026 20:58:50 +0100 Subject: [PATCH 133/137] Remove version constraint on fedora-gnat-project-common The constraint is satisfied in all supported versions of Fedora. --- xmlada.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmlada.spec b/xmlada.spec index 0343ee6..01a25a8 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -31,8 +31,7 @@ Source1: xmlada.gpr BuildRequires: make %if %{without bootstrap} BuildRequires: gcc-gnat gprbuild sed -# A fedora-gnat-project-common that contains the macro GPRinstall is needed. -BuildRequires: fedora-gnat-project-common >= 3.21 +BuildRequires: fedora-gnat-project-common BuildRequires: python3-sphinx BuildRequires: python3-sphinx-latex BuildRequires: python3-sphinx_rtd_theme From 50187327edc983583b538e4988cd7403635b788b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:45:30 +0000 Subject: [PATCH 134/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 01a25a8..f1e9c4b 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2:26.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Dec 23 2025 Dennis van Raaij - 2:26.0.0-1 - Updated to v26.0.0. From 60ec67aed1a52d3f6d7ae2c9445b2a596212e5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 28 Mar 2026 23:10:53 +0100 Subject: [PATCH 135/137] Rebuilt because GCC 16.0.1-0.10 broke ALI. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index f1e9c4b..4ae6960 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sat Mar 28 2026 Björn Persson - 2:26.0.0-3 +- Rebuilt because GCC 16.0.1-0.10 broke ALI. + * Sat Jan 17 2026 Fedora Release Engineering - 2:26.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 66b7efa76d7740ef019fb7b8d3239b9509820ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sun, 10 May 2026 20:06:51 +0200 Subject: [PATCH 136/137] Rebuilt because GCC broke ALI again. --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index 4ae6960..a726f52 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Sun May 10 2026 Björn Persson - 2:26.0.0-4 +- Rebuilt because GCC broke ALI again. + * Sat Mar 28 2026 Björn Persson - 2:26.0.0-3 - Rebuilt because GCC 16.0.1-0.10 broke ALI. From 69f8c98e46e09bf6f2f5c565545629ed6d0aea70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:18:19 +0000 Subject: [PATCH 137/137] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmlada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlada.spec b/xmlada.spec index a726f52..bb65e7e 100644 --- a/xmlada.spec +++ b/xmlada.spec @@ -12,7 +12,7 @@ Name: xmlada Epoch: 2 Version: %{upstream_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: XML library for Ada License: GPL-3.0-or-later WITH GCC-exception-3.1 AND Unicode-DFS-2016 @@ -279,6 +279,9 @@ find %{buildroot}%{_includedir}/%{name}/sources -type d -empty -delete ############### %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2:26.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sun May 10 2026 Björn Persson - 2:26.0.0-4 - Rebuilt because GCC broke ALI again.