folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dev] Add provides to libxml2, libxslt, and docbook-style-xsl (#431)

This commit is contained in:
Joe Schmitt 2020-12-02 16:56:08 -05:00 committed by GitHub
parent 88d383267c
commit 92c910b6fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 103 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
SPECS/docbook-style-xsl/docbook-style-xsl.spec
View File

@ -1,17 +1,18 @@
Summary: Docbook-xsl-1.79.1
Name: docbook-style-xsl
Version: 1.79.1
Release: 11%{?dist}
License: ASL 2.0
URL: http://www.docbook.org
Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
Group: Development/Tools
Summary: Docbook-xsl-1.79.1
Name: docbook-style-xsl
Version: 1.79.1
Release: 12%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Provides: docbook-xsl = %{version}-%{release}
Requires: libxml2
BuildRequires: libxml2
Group: Development/Tools
URL: https://www.docbook.org
Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
BuildRequires: libxml2
BuildRequires: zip
Requires: libxml2
Provides: docbook-xsl = %{version}-%{release}
Provides: docbook-xsl-stylesheets = %{version}-%{release}
BuildArch: noarch
%description
@ -19,8 +20,9 @@ The DocBook XML DTD-4.5 package contains document type definitions for
verification of XML data files against the DocBook rule set. These are
useful for structuring books and software documentation to a standard
allowing you to utilize transformations already written for that standard.
%prep
%setup -qn docbook-xsl-%{version}
%setup -q -n docbook-xsl-%{version}
%build
zip -d tools/lib/jython.jar Lib/distutils/command/wininst-6.exe
@ -54,67 +56,84 @@ install -v -m644 RELEASE-NOTES* NEWS* \
#make %{?_smp_mflags} check
%post
if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
if [ ! -f /etc/xml/catalog ]; then
xmlcatalog --noout --create /etc/xml/catalog
if [ ! -d %{_sysconfdir}/xml ]; then install -v -m755 -d %{_sysconfdir}/xml; fi &&
if [ ! -f %{_sysconfdir}/xml/catalog ]; then
xmlcatalog --noout --create %{_sysconfdir}/xml/catalog
fi &&
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/1.79.1" \
"/usr/share/xml/docbook/xsl-stylesheets-1.79.1" \
/etc/xml/catalog &&
"%{_datadir}/xml/docbook/xsl-stylesheets-1.79.1" \
%{_sysconfdir}/xml/catalog &&
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/1.79.1" \
"/usr/share/xml/docbook/xsl-stylesheets-1.79.1" \
/etc/xml/catalog &&
"%{_datadir}/xml/docbook/xsl-stylesheets-1.79.1" \
%{_sysconfdir}/xml/catalog &&
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
"/usr/share/xml/docbook/xsl-stylesheets-1.79.1" \
/etc/xml/catalog &&
"%{_datadir}/xml/docbook/xsl-stylesheets-1.79.1" \
%{_sysconfdir}/xml/catalog &&
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
"/usr/share/xml/docbook/xsl-stylesheets-1.79.1" \
/etc/xml/catalog
"%{_datadir}/xml/docbook/xsl-stylesheets-1.79.1" \
%{_sysconfdir}/xml/catalog
%postun
if [ $1 -eq 0 ] ; then
if [ -f /etc/xml/catalog ]; then
if [ -f %{_sysconfdir}/xml/catalog ]; then
xmlcatalog --noout --del \
"/usr/share/xml/docbook/xsl-stylesheets-1.79.1" /etc/xml/catalog
"%{_datadir}/xml/docbook/xsl-stylesheets-1.79.1" %{_sysconfdir}/xml/catalog
fi
fi
%files
%defattr(-,root,root)
%license COPYING
/usr/share/xml/docbook/*
%{_datadir}/xml/docbook/*
%{_docdir}/*
%changelog
* Tue Dec 01 2020 Joe Schmitt <joschmit@microsoft.com> - 1.79.1-12
- Provide docbook-xsl-stylesheets.
* Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 1.79.1-11
- Provide docbook-xsl
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 1.79.1-10
- Added %%license line automatically
* Tue May 05 2020 Emre Girgin <mrgirgin@microsoft.com> 1.79.1-9
- Renaming docbook-xsl to docbook-style-xsl
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.79.1-8
- Initial CBL-Mariner import from Photon (license: Apache2).
* Fri Jan 18 2019 Tapas Kundu <tkundu@vmware.com> 1.79.1-7
- Removed saxon jar files while installing
* Tue Dec 04 2018 Ashwin H<ashwinh@vmware.com> 1.79.1-6
- Remove windows installers
* Fri Aug 18 2017 Rongrong Qiu <rqiu@vmware.com> 1.79.1-5
- Update make check for bug 1635477
* Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-4
- Fix arch
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.79.1-3
- GA - Bump release of all rpms
* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com> 1.79.1-2
- Fixing spec file to handle rpm upgrade scenario correctly
* Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 1.79.1-1
- Updated version.
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 1.78.1-2
- Updated group.
* Mon Nov 24 2014 Divya Thaluru <dthaluru@vmware.com> 1.78.1-1
- Initial build. First version

8
SPECS/libxml2/libxml2.spec
View File

@ -3,7 +3,7 @@
Summary: Libxml2
Name: libxml2
Version: 2.9.10
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -16,6 +16,8 @@ BuildRequires: python2-devel
BuildRequires: python2-libs
BuildRequires: python3-devel
Provides: pkgconfig(libxml-2.0) = %{version}-%{release}
Provides: %{name}-tools = %{version}-%{release}
Provides: libxml-tools = %{version}-%{release}
%description
The libxml2 package contains libraries and utilities used for parsing XML files.
@ -77,6 +79,7 @@ make %{?_smp_mflags} check
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%license COPYING
@ -104,6 +107,9 @@ rm -rf %{buildroot}/*
%{_libdir}/cmake/libxml2/libxml2-config.cmake
%changelog
* Tue Dec 01 2020 Joe Schmitt <joschmit@microsoft.com> - 2.9.10-4
- Provide libxml-tools and libxml2-tools.
* Tue Nov 03 2020 Joe Schmitt <joschmit@microsoft.com> - 2.9.10-3
- Version pkgconfig(libxml-2.0) provide.

36
SPECS/libxslt/libxslt.spec
View File

@ -1,17 +1,18 @@
Summary: Libxslt is the XSLT C library developed for the GNOME project. XSLT is a an XML language to define transformation for XML.
Name: libxslt
Version: 1.1.34
Release: 2%{?dist}
Release: 3%{?dist}
License: MIT
URL: http://xmlsoft.org/libxslt/
Group: System Environment/General Libraries
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/General Libraries
URL: http://xmlsoft.org/libxslt/
Source0: http://xmlsoft.org/sources/%{name}-%{version}.tar.gz
Requires: libxml2-devel
Requires: libgcrypt
BuildRequires: libxml2-devel
BuildRequires: libgcrypt-devel
BuildRequires: libxml2-devel
Requires: libgcrypt
Requires: libxml2-devel
Provides: %{name}-tools = %{version}-%{release}
%description
The libxslt package contains XSLT libraries used for extending libxml2 libraries to support XSLT files.
@ -20,11 +21,13 @@ The libxslt package contains XSLT libraries used for extending libxml2 libraries
Summary: Development Libraries for libxslt
Group: Development/Libraries
Requires: libxslt = %{version}-%{release}
%description devel
Header files for doing development with libxslt.
%prep
%setup -q
%build
./configure \
--prefix=%{_prefix} \
@ -33,10 +36,11 @@ Header files for doing development with libxslt.
--disable-static \
--without-python
make %{?_smp_mflags}
%install
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
make DESTDIR=%{buildroot} install
find %{buildroot} -name '*.la' -delete
find %{buildroot} -type f -name "*.la" -delete -print
%{_fixperms} %{buildroot}/*
%check
@ -44,8 +48,10 @@ make %{?_smp_mflags} check
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%license COPYING
@ -65,33 +71,49 @@ rm -rf %{buildroot}/*
%{_mandir}/man3/*
%changelog
* Tue Dec 01 2020 Joe Schmitt <joschmit@microsoft.com> - 1.1.34-3
- Provide libxslt-tools.
* Wed Aug 19 2020 Henry Beberman <henry.beberman@microsoft.com> 1.1.34-2
- Add dependency on libgcrypt
* Mon Jun 08 2020 Joe Schmitt <joschmit@microsoft.com> 1.1.34-1
- Update to version 1.1.34 to resolve CVE-2019-11068.
- Remove patch for CVE-2019-5815 since it is fixed in 1.1.34.
- License verified.
* Tue May 12 2020 Paul Monson <paulmon@microsoft.com> 1.1.32-4
- Add patch for CVE-2019-5815
* Sat May 09 00:21:44 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.1.32-3
- Added %%license line automatically
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.1.32-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Wed Sep 12 2018 Keerthana K <keerthanak@vmware.com> 1.1.32-1
- Update to version 1.1.32.
* Tue Jul 11 2017 Divya Thaluru <dthaluru@vmware.com> 1.1.29-4
- Applied patches for CVE-2015-9019 and CVE-2017-5029.
* Tue May 23 2017 Kumar Kaushik <kaushikk@vmware.com> 1.1.29-3
- Build does not requires python.
* Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.29-2
- Moved man3 to devel subpackage.
* Fri Oct 21 2016 Vinay Kulkarni <kulkarniv@vmware.com> 1.1.29-1
- Fix CVEs 2016-1683, 2016-1684, 2015-7995 with version 1.1.29
* Mon Oct 03 2016 Chang Lee <changlee@vmware.com> 1.1.28-4
- Modified check
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1.28-3
- GA - Bump release of all rpms
* Tue Jan 19 2016 Xiaolin Li <xiaolinl@vmware.com> 1.1.28-2
- Add a dev subpackage.
* Mon Oct 13 2014 Divya Thaluru <dthaluru@vmware.com> 1.1.28-1
- Initial build. First version

4
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -196,8 +196,8 @@ tdnf-cli-libs-2.1.0-4.cm1.aarch64.rpm
tdnf-devel-2.1.0-4.cm1.aarch64.rpm
tdnf-plugin-repogpgcheck-2.1.0-4.cm1.aarch64.rpm
createrepo_c-0.11.1-6.cm1.aarch64.rpm
libxml2-2.9.10-3.cm1.aarch64.rpm
libxml2-devel-2.9.10-3.cm1.aarch64.rpm
libxml2-2.9.10-4.cm1.aarch64.rpm
libxml2-devel-2.9.10-4.cm1.aarch64.rpm
glib-2.58.0-8.cm1.aarch64.rpm
libltdl-2.4.6-6.cm1.aarch64.rpm
libltdl-devel-2.4.6-6.cm1.aarch64.rpm

4
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -196,8 +196,8 @@ tdnf-cli-libs-2.1.0-4.cm1.x86_64.rpm
tdnf-devel-2.1.0-4.cm1.x86_64.rpm
tdnf-plugin-repogpgcheck-2.1.0-4.cm1.x86_64.rpm
createrepo_c-0.11.1-6.cm1.x86_64.rpm
libxml2-2.9.10-3.cm1.x86_64.rpm
libxml2-devel-2.9.10-3.cm1.x86_64.rpm
libxml2-2.9.10-4.cm1.x86_64.rpm
libxml2-devel-2.9.10-4.cm1.x86_64.rpm
glib-2.58.0-8.cm1.x86_64.rpm
libltdl-2.4.6-6.cm1.x86_64.rpm
libltdl-devel-2.4.6-6.cm1.x86_64.rpm

18
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -60,7 +60,7 @@ device-mapper-libs-2.03.05-6.cm1.aarch64.rpm
diffutils-3.6-4.cm1.aarch64.rpm
diffutils-debuginfo-3.6-4.cm1.aarch64.rpm
docbook-dtd-xml-4.5-11.cm1.noarch.rpm
docbook-style-xsl-1.79.1-11.cm1.noarch.rpm
docbook-style-xsl-1.79.1-12.cm1.noarch.rpm
dwz-0.13-4.cm1.aarch64.rpm
dwz-debuginfo-0.13-4.cm1.aarch64.rpm
e2fsprogs-1.44.6-3.cm1.aarch64.rpm
@ -227,13 +227,13 @@ libtasn1-debuginfo-4.14-2.cm1.aarch64.rpm
libtasn1-devel-4.14-2.cm1.aarch64.rpm
libtool-2.4.6-6.cm1.aarch64.rpm
libtool-debuginfo-2.4.6-6.cm1.aarch64.rpm
libxml2-2.9.10-3.cm1.aarch64.rpm
libxml2-debuginfo-2.9.10-3.cm1.aarch64.rpm
libxml2-devel-2.9.10-3.cm1.aarch64.rpm
libxml2-python-2.9.10-3.cm1.aarch64.rpm
libxslt-1.1.34-2.cm1.aarch64.rpm
libxslt-debuginfo-1.1.34-2.cm1.aarch64.rpm
libxslt-devel-1.1.34-2.cm1.aarch64.rpm
libxml2-2.9.10-4.cm1.aarch64.rpm
libxml2-debuginfo-2.9.10-4.cm1.aarch64.rpm
libxml2-devel-2.9.10-4.cm1.aarch64.rpm
libxml2-python-2.9.10-4.cm1.aarch64.rpm
libxslt-1.1.34-3.cm1.aarch64.rpm
libxslt-debuginfo-1.1.34-3.cm1.aarch64.rpm
libxslt-devel-1.1.34-3.cm1.aarch64.rpm
lua-5.3.5-11.cm1.aarch64.rpm
lua-debuginfo-5.3.5-11.cm1.aarch64.rpm
lua-devel-5.3.5-11.cm1.aarch64.rpm
@ -531,7 +531,7 @@ python3-debuginfo-3.7.7-5.cm1.aarch64.rpm
python3-devel-3.7.7-5.cm1.aarch64.rpm
python3-gpg-1.13.1-5.cm1.aarch64.rpm
python3-libs-3.7.7-5.cm1.aarch64.rpm
python3-libxml2-2.9.10-3.cm1.aarch64.rpm
python3-libxml2-2.9.10-4.cm1.aarch64.rpm
python3-pip-3.7.7-5.cm1.noarch.rpm
python3-pwquality-1.4.2-4.cm1.aarch64.rpm
python3-rpm-4.14.2-10.cm1.aarch64.rpm

18
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -60,7 +60,7 @@ device-mapper-libs-2.03.05-6.cm1.x86_64.rpm
diffutils-3.6-4.cm1.x86_64.rpm
diffutils-debuginfo-3.6-4.cm1.x86_64.rpm
docbook-dtd-xml-4.5-11.cm1.noarch.rpm
docbook-style-xsl-1.79.1-11.cm1.noarch.rpm
docbook-style-xsl-1.79.1-12.cm1.noarch.rpm
dwz-0.13-4.cm1.x86_64.rpm
dwz-debuginfo-0.13-4.cm1.x86_64.rpm
e2fsprogs-1.44.6-3.cm1.x86_64.rpm
@ -227,13 +227,13 @@ libtasn1-debuginfo-4.14-2.cm1.x86_64.rpm
libtasn1-devel-4.14-2.cm1.x86_64.rpm
libtool-2.4.6-6.cm1.x86_64.rpm
libtool-debuginfo-2.4.6-6.cm1.x86_64.rpm
libxml2-2.9.10-3.cm1.x86_64.rpm
libxml2-debuginfo-2.9.10-3.cm1.x86_64.rpm
libxml2-devel-2.9.10-3.cm1.x86_64.rpm
libxml2-python-2.9.10-3.cm1.x86_64.rpm
libxslt-1.1.34-2.cm1.x86_64.rpm
libxslt-debuginfo-1.1.34-2.cm1.x86_64.rpm
libxslt-devel-1.1.34-2.cm1.x86_64.rpm
libxml2-2.9.10-4.cm1.x86_64.rpm
libxml2-debuginfo-2.9.10-4.cm1.x86_64.rpm
libxml2-devel-2.9.10-4.cm1.x86_64.rpm
libxml2-python-2.9.10-4.cm1.x86_64.rpm
libxslt-1.1.34-3.cm1.x86_64.rpm
libxslt-debuginfo-1.1.34-3.cm1.x86_64.rpm
libxslt-devel-1.1.34-3.cm1.x86_64.rpm
lua-5.3.5-11.cm1.x86_64.rpm
lua-debuginfo-5.3.5-11.cm1.x86_64.rpm
lua-devel-5.3.5-11.cm1.x86_64.rpm
@ -531,7 +531,7 @@ python3-debuginfo-3.7.7-5.cm1.x86_64.rpm
python3-devel-3.7.7-5.cm1.x86_64.rpm
python3-gpg-1.13.1-5.cm1.x86_64.rpm
python3-libs-3.7.7-5.cm1.x86_64.rpm
python3-libxml2-2.9.10-3.cm1.x86_64.rpm
python3-libxml2-2.9.10-4.cm1.x86_64.rpm
python3-pip-3.7.7-5.cm1.noarch.rpm
python3-pwquality-1.4.2-4.cm1.x86_64.rpm
python3-rpm-4.14.2-10.cm1.x86_64.rpm