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

Removing Python 2 dependency from 'itstool' and updating toolchain build. (#976)

This commit is contained in:
Pawel Winogrodzki 2021-05-24 15:17:00 -07:00 committed by GitHub
parent 6a41abafa2
commit 54e7e22aa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
SPECS/itstool/itstool.spec
View File

@ -1,32 +1,37 @@
Summary: ITS XML document translation tool
Name: itstool
Version: 2.0.6
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Development/Tools
URL: http://itstool.org
Source0: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
Group: Development/Tools
Vendor: Microsoft Corporation
Distribution: Mariner
BuildRequires: docbook-dtd-xml >= 4.5
BuildRequires: libxml2
BuildRequires: libxml2-python
BuildRequires: python2 >= 2.7.8
BuildRequires: python2-libs >= 2.7.8
Requires: python2
Requires: libxml2-python
BuildRequires: python3
BuildRequires: python3-libs
BuildRequires: python3-libxml2
Requires: python3
Requires: python3-libxml2
BuildArch: noarch
%description
Itstool extracts messages from XML files and outputs PO template files, then merges
translations from MO files to create translated XML files. It determines what
to translate and how to chunk it into messages using the W3C Internationalization Tag Set (ITS).
%prep
%setup -q
%build
./configure --prefix=%{_prefix}
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
@ -34,25 +39,36 @@ make DESTDIR=%{buildroot} install
%defattr(-,root,root)
%license COPYING
%{_bindir}/*
/usr/share/%{name}/*
%{_datadir}/%{name}/*
%{_mandir}/man1/*
%changelog
* Sat May 09 00:20:54 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.0.6-3
* Mon May 24 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.6-4
- Update to build against Python 3 instead of Python 2.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 2.0.6-3
- Added %%license line automatically
* Tue May 05 2020 Emre Girgin <mrgirgin@microsoft.com> 2.0.6-2
- Renaming docbook-xml to docbook-dtd-xml
* Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 2.0.6-1
- Update to 2.0.4. Fix Source0 URL. Fix summary. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.0.2-6
- Initial CBL-Mariner import from Photon (license: Apache2).
* Mon May 1 2017 Divya Thaluru <dthaluru@vmware.com> 2.0.2-5
- Added runtime dependencies for itstool
* Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.2-4
- Fix arch
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.2-3
- GA - Bump release of all rpms
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.0.2-2
- Updated group.
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.0.2-1
- Initial build. First version
* Tue May 05 2020 Emre Girgin <mrgirgin@microsoft.com> - 2.0.6-2
- Renaming docbook-xml to docbook-dtd-xml
* Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> - 2.0.6-1
- Update to 2.0.4. Fix Source0 URL. Fix summary. License verified.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> - 2.0.2-6
- Initial CBL-Mariner import from Photon (license: Apache2).
* Mon May 1 2017 Divya Thaluru <dthaluru@vmware.com> - 2.0.2-5
- Added runtime dependencies for itstool
* Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 2.0.2-4
- Fix arch
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> - 2.0.2-3
- GA - Bump release of all rpms
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> - 2.0.2-2
- Updated group.
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> - 2.0.2-1
- Initial build. First version

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

@ -145,7 +145,7 @@ gzip-1.9-6.cm1.aarch64.rpm
gzip-debuginfo-1.9-6.cm1.aarch64.rpm
integritysetup-2.3.3-2.cm1.aarch64.rpm
intltool-0.51.0-7.cm1.noarch.rpm
itstool-2.0.6-3.cm1.noarch.rpm
itstool-2.0.6-4.cm1.noarch.rpm
json-c-0.14-3.cm1.aarch64.rpm
json-c-debuginfo-0.14-3.cm1.aarch64.rpm
json-c-devel-0.14-3.cm1.aarch64.rpm

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

@ -145,7 +145,7 @@ gzip-1.9-6.cm1.x86_64.rpm
gzip-debuginfo-1.9-6.cm1.x86_64.rpm
integritysetup-2.3.3-2.cm1.x86_64.rpm
intltool-0.51.0-7.cm1.noarch.rpm
itstool-2.0.6-3.cm1.noarch.rpm
itstool-2.0.6-4.cm1.noarch.rpm
json-c-0.14-3.cm1.x86_64.rpm
json-c-debuginfo-0.14-3.cm1.x86_64.rpm
json-c-devel-0.14-3.cm1.x86_64.rpm

15
toolkit/scripts/toolchain/build_official_toolchain_rpms.sh
View File

@ -373,11 +373,11 @@ build_rpm_in_chroot_no_install krb5
chroot_and_install_rpms libssh2
build_rpm_in_chroot_no_install curl
# python-setuptools needs python-xml
# python-xml is built by building python2
chroot_and_install_rpms python-xml
# python3-setuptools needs python3-xml
# python3-xml is built by building python3
chroot_and_install_rpms python3-xml
# cracklib needs python-setuptools
# cracklib needs python3-setuptools
chroot_and_install_rpms python3-setuptools
build_rpm_in_chroot_no_install cracklib
@ -406,12 +406,9 @@ build_rpm_in_chroot_no_install gtest
build_rpm_in_chroot_no_install libsolv
# glib needs perl-XML-Parser, python-xml, gtk-doc, meson, libselinux
# glib needs perl-XML-Parser, python3-xml, gtk-doc, meson, libselinux
chroot_and_install_rpms perl-XML-Parser
# python-xml is built by building python2
chroot_and_install_rpms python3-xml
build_rpm_in_chroot_no_install itstool
# gtk-doc needs itstool
@ -516,7 +513,7 @@ build_rpm_in_chroot_no_install libtasn1
chroot_and_install_rpms libtasn1
build_rpm_in_chroot_no_install p11-kit
# asciidoc needs python-xml
# asciidoc needs python3-xml
build_rpm_in_chroot_no_install asciidoc
# ca-certificates needs p11-kit and asciidoc