diff --git a/SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.signatures.json b/SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.signatures.json deleted file mode 100644 index d01294ecd7..0000000000 --- a/SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.signatures.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Signatures": { - "perl-XML-XPath-1.44.tar.gz": "1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f" - } -} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-CPAN-Changes/perl-CPAN-Changes.signatures.json b/SPECS/perl-CPAN-Changes/perl-CPAN-Changes.signatures.json similarity index 100% rename from SPECS-EXTENDED/perl-CPAN-Changes/perl-CPAN-Changes.signatures.json rename to SPECS/perl-CPAN-Changes/perl-CPAN-Changes.signatures.json diff --git a/SPECS-EXTENDED/perl-CPAN-Changes/perl-CPAN-Changes.spec b/SPECS/perl-CPAN-Changes/perl-CPAN-Changes.spec similarity index 87% rename from SPECS-EXTENDED/perl-CPAN-Changes/perl-CPAN-Changes.spec rename to SPECS/perl-CPAN-Changes/perl-CPAN-Changes.spec index 9c84aead18..bc1f2ca859 100644 --- a/SPECS-EXTENDED/perl-CPAN-Changes/perl-CPAN-Changes.spec +++ b/SPECS/perl-CPAN-Changes/perl-CPAN-Changes.spec @@ -1,43 +1,52 @@ -Name: perl-CPAN-Changes -Summary: Read and write Changes files -Version: 0.400002 -Release: 15%{?dist} -License: GPL+ or Artistic +Summary: Read and write Changes files +Name: perl-CPAN-Changes +Version: 0.400002 +Release: 16%{?dist} +License: GPL+ OR Artistic Vendor: Microsoft Corporation Distribution: Mariner -URL: https://metacpan.org/release/CPAN-Changes -Source0: https://cpan.metacpan.org/modules/by-module/CPAN/CPAN-Changes-%{version}.tar.gz#/perl-CPAN-Changes-%{version}.tar.gz -BuildArch: noarch +URL: https://metacpan.org/release/CPAN-Changes +Source0: https://cpan.metacpan.org/modules/by-module/CPAN/CPAN-Changes-%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildArch: noarch + # Module Build -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: make -BuildRequires: perl-generators -BuildRequires: perl-interpreter -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl-generators +BuildRequires: perl-interpreter + # Module Runtime -BuildRequires: perl(Encode) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(strict) -BuildRequires: perl(Test::Builder) -BuildRequires: perl(Text::Wrap) -BuildRequires: perl(version) >= 0.99.06 -BuildRequires: perl(warnings) +BuildRequires: perl(Encode) +BuildRequires: perl(ExtUtils::MakeMaker) + # Script Runtime -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(Pod::Usage) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(Pod::Usage) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::Builder) +BuildRequires: perl(Text::Wrap) +BuildRequires: perl(strict) +BuildRequires: perl(version) >= 0.99.06 +BuildRequires: perl(warnings) + +%if %{with_check} # Test Suite -BuildRequires: perl(Test::More) >= 0.96 -# Optional Tests -%if 0%{?fedora:1} -BuildRequires: perl(Moo) -%endif +BuildRequires: perl(Test::More) >= 0.96 + # Extra Tests -BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.00 +BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::Pod::Coverage) >= 1.00 + +# Optional Tests, currently not supported in Mariner. +%if 0 +BuildRequires: perl(Moo) +%endif +%endif + # Runtime -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Requires: perl(version) >= 0.99.06 +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(version) >= 0.99.06 %description It is standard practice to include a Changes file in your distribution. The @@ -80,6 +89,10 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" %{_mandir}/man3/Test::CPAN::Changes.3* %changelog +* Wed Jul 20 2022 Pawel Winogrodzki - 0.400002-16 +- License verified. +- Spec clean-up. + * Fri Oct 15 2021 Pawel Winogrodzki - 0.400002-15 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS/perl-XML-XPath/perl-XML-XPath.signatures.json b/SPECS/perl-XML-XPath/perl-XML-XPath.signatures.json new file mode 100644 index 0000000000..e6b0b441f3 --- /dev/null +++ b/SPECS/perl-XML-XPath/perl-XML-XPath.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "XML-XPath-1.44.tar.gz": "1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f" + } +} \ No newline at end of file diff --git a/SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.spec b/SPECS/perl-XML-XPath/perl-XML-XPath.spec similarity index 84% rename from SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.spec rename to SPECS/perl-XML-XPath/perl-XML-XPath.spec index c7ded82b0d..b37ecb0c60 100644 --- a/SPECS-EXTENDED/perl-XML-XPath/perl-XML-XPath.spec +++ b/SPECS/perl-XML-XPath/perl-XML-XPath.spec @@ -1,51 +1,57 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(XML::Parser\\)$ + +# Optional tests, disabled due to missing dependencies. +%bcond_with perl_XML_XPath_enables_optional_test + +Summary: XPath parser and evaluator for Perl Name: perl-XML-XPath Version: 1.44 -Release: 6%{?dist} -Summary: XPath parser and evaluator for Perl +Release: 13%{?dist} # XML/XPath.pm, XML/XPath/PerlSAX.pm, REAME: GPL+ or Artistic # Others: Artistic 2.0 -License: Artistic 2.0 and (GPL+ or Artistic) +License: Artistic 2.0 AND (GPL+ OR Artistic) +Vendor: Microsoft Corporation +Distribution: Mariner URL: https://metacpan.org/release/XML-XPath -Source0: https://cpan.metacpan.org/authors/id/M/MA/MANWAR/XML-XPath-%{version}.tar.gz#/perl-XML-XPath-%{version}.tar.gz - +Source0: https://cpan.metacpan.org/authors/id/M/MA/MANWAR/XML-XPath-%{version}.tar.gz BuildArch: noarch + BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 -BuildRequires: perl(strict) -BuildRequires: perl(warnings) -# Run-time BuildRequires: perl(Carp) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(IO::File) -BuildRequires: perl(overload) BuildRequires: perl(POSIX) BuildRequires: perl(Scalar::Util) -BuildRequires: perl(vars) BuildRequires: perl(XML::Parser) >= 2.23 -# Tests -BuildRequires: perl(lib) -BuildRequires: perl(open) -BuildRequires: perl(Path::Tiny) >= 0.076 +BuildRequires: perl(overload) +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) + +%if %{with_check} +BuildRequires: perl(App::cpanminus) BuildRequires: perl(Test) BuildRequires: perl(Test::More) +BuildRequires: perl(lib) +BuildRequires: perl(open) BuildRequires: perl(utf8) # Optional tests +%if %{with perl_XML_XPath_enables_optional_test} BuildRequires: perl(CPAN::Meta) BuildRequires: perl(Test::CPAN::Meta) BuildRequires: perl(Test::CPAN::Meta::JSON) +%endif +%endif Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(POSIX) -Requires: perl(warnings) Requires: perl(XML::Parser) >= 2.23 - -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\(XML::Parser\)$ +Requires: perl(warnings) %description This module aims to comply exactly to the XPath specification at @@ -57,19 +63,20 @@ this as they support functionality beyond XPath. %setup -q -n XML-XPath-%{version} %build -perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%make_build %install -make pure_install DESTDIR=$RPM_BUILD_ROOT -%{_fixperms} $RPM_BUILD_ROOT/* +%make_install +%_fixperms %{buildroot}/* -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ -cat >> $RPM_BUILD_ROOT/%{_mandir}/man1/xpath.1 << EOF +mkdir -p %{buildroot}/%{_mandir}/man1/ +cat >> %{buildroot}/%{_mandir}/man1/xpath.1 << EOF .so man3/XML::XPath.3pm EOF %check +cpanm Path::Tiny make test %files @@ -81,8 +88,30 @@ make test %{_mandir}/man3/*.3* %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 1.44-6 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Jul 20 2022 Pawel Winogrodzki - 1.44-13 +- Initial CBL-Mariner import from Fedora 36 (license: MIT). +- License verified. + +* Fri Jan 21 2022 Fedora Release Engineering - 1.44-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.44-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.44-10 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.44-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 15 2020 Jitka Plesnikova - 1.44-8 +- Do not run optional test on RHEL + +* Tue Jul 28 2020 Fedora Release Engineering - 1.44-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 1.44-6 +- Perl 5.32 rebuild * Thu Jan 30 2020 Fedora Release Engineering - 1.44-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/SPECS/pyproject-rpm-macros/pyproject-rpm-macros.spec b/SPECS/pyproject-rpm-macros/pyproject-rpm-macros.spec index fdcd230005..227b39d375 100644 --- a/SPECS/pyproject-rpm-macros/pyproject-rpm-macros.spec +++ b/SPECS/pyproject-rpm-macros/pyproject-rpm-macros.spec @@ -7,7 +7,7 @@ Name: pyproject-rpm-macros # Increment Z when this is a bugfix or a cosmetic change # Dropping support for EOL Fedoras is *not* considered a breaking change Version: 1.0.0~rc1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -42,15 +42,17 @@ Source901: README.md Source902: LICENSE %if %{with_check} +BuildRequires: python3-atomicwrites +BuildRequires: python3-attrs +BuildRequires: python3-pip +BuildRequires: python3-pluggy +BuildRequires: python3-six BuildRequires: python3dist(packaging) BuildRequires: python3dist(pip) -BuildRequires: python3dist(pytest) BuildRequires: python3dist(pyyaml) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(tox-current-env) >= 0.0.6 BuildRequires: python3dist(wheel) -# Available only in SPECS-EXTENDED: -BuildRequires: python3dist(toml) %endif Requires: %{_bindir}/find @@ -94,14 +96,18 @@ install -m 644 pyproject_construct_toxenv.py %{buildroot}%{_rpmconfigdir}/marine install -m 644 pyproject_requirements_txt.py %{buildroot}%{_rpmconfigdir}/mariner/ %check +pip3 install more_itertools pytest>=3.9 toml tox export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856356 %{python3} -m pytest -vv --doctest-modules +test_status=$? # brp-compress is provided as an argument to get the right directory macro expansion %{python3} compare_mandata.py -f %{_rpmconfigdir}/brp-compress - +[[ $? -eq 0 && $test_status -eq 0 ]] %files +%license LICENSE +%doc README.md %{_rpmmacrodir}/macros.pyproject %{_rpmconfigdir}/mariner/pyproject_buildrequires.py %{_rpmconfigdir}/mariner/pyproject_convert.py @@ -110,10 +116,10 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %{_rpmconfigdir}/mariner/pyproject_construct_toxenv.py %{_rpmconfigdir}/mariner/pyproject_requirements_txt.py -%doc README.md -%license LICENSE - %changelog +* Thu Jul 21 2022 Pawel Winogrodzki - 1.0.0~rc1-3 +- Adding missing test dependencies. + * Mon Feb 14 2022 Pawel Winogrodzki - 1.0.0~rc1-2 - Initial CBL-Mariner import from Fedora 36 (license: MIT). - License verified. diff --git a/SPECS/python-flit/python-flit.spec b/SPECS/python-flit/python-flit.spec index 771b25046d..15f9783f90 100644 --- a/SPECS/python-flit/python-flit.spec +++ b/SPECS/python-flit/python-flit.spec @@ -13,7 +13,7 @@ so long as they can be imported on Python 3.} Summary: Simplified packaging of Python modules Name: python-%{srcname} Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} # ./flit/log.py under ASL 2.0 license # ./flit/upload.py under PSF license License: BSD AND ASL 2.0 AND Python @@ -44,8 +44,8 @@ BuildRequires: which BuildRequires: python3-requests BuildRequires: python3-responses -# Test deps that require flit to build: -BuildRequires: python3-testpath +# Test deps that require flit to build, using 'pip3' instead: +# BuildRequires: python3-testpath %endif %description %{_description} @@ -53,7 +53,7 @@ BuildRequires: python3-testpath %package -n python3-%{srcname} %{?python_provide:%python_provide python3-%{srcname}} Summary: %{summary} -Requires: python3-%{srcname}-core = %{version}-%{release} +Requires: python3-%{srcname}-core = %{version} # soft dependency: (WARNING) Cannot analyze code. Pygments package not found. Recommends: python3-pygments @@ -81,7 +81,7 @@ then ln -s "$(which python3)" "%{_bindir}/python" fi -pip3 install more-itertools pluggy pytest tomli_w +pip3 install more-itertools pluggy pytest testpath tomli_w # flit attempts to download list of classifiers from PyPI, but not if it's cached # test_invalid_classifier fails without the list @@ -101,6 +101,9 @@ sudo -u test %pytest -k "not test_test_writable_dir_win" %{_bindir}/flit %changelog +* Wed Jul 20 2022 Pawel Winogrodzki - 3.7.1-3 +- Using pip3 to install 'testpath' for ptest runs. + * Mon Mar 28 2022 Pawel Winogrodzki - 3.7.1-2 - Initial CBL-Mariner import from Fedora 36 (license: MIT). - License verified. diff --git a/cgmanifest.json b/cgmanifest.json index fecb73e983..800f904019 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2102,16 +2102,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "dcos-cli", - "version": "1.2.0", - "downloadUrl": "https://github.com/dcos/dcos-cli/archive/refs/tags/1.2.0.tar.gz" - } - } - }, { "component": { "type": "other", @@ -2132,6 +2122,16 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "dcos-cli", + "version": "1.2.0", + "downloadUrl": "https://github.com/dcos/dcos-cli/archive/refs/tags/1.2.0.tar.gz" + } + } + }, { "component": { "type": "other", diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0480cd81dc..d2055908a5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -245,6 +245,6 @@ newt-lang-0.52.21-4.cm2.aarch64.rpm chkconfig-1.20-3.cm2.aarch64.rpm chkconfig-lang-1.20-3.cm2.aarch64.rpm msopenjdk-11-11.0.14.1+1-LTS-31207.aarch64.rpm -pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm +pyproject-rpm-macros-1.0.0~rc1-3.cm2.noarch.rpm audit-3.0.6-7.cm2.aarch64.rpm audit-libs-3.0.6-7.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 5dcfb2b60d..b9bb18a689 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -245,6 +245,6 @@ newt-lang-0.52.21-4.cm2.x86_64.rpm chkconfig-1.20-3.cm2.x86_64.rpm chkconfig-lang-1.20-3.cm2.x86_64.rpm msopenjdk-11-11.0.14.1+1-LTS-31207.x86_64.rpm -pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm +pyproject-rpm-macros-1.0.0~rc1-3.cm2.noarch.rpm audit-3.0.6-7.cm2.x86_64.rpm audit-libs-3.0.6-7.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index cdbf48d57f..38d4c544c7 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -497,7 +497,7 @@ procps-ng-3.3.17-1.cm2.aarch64.rpm procps-ng-debuginfo-3.3.17-1.cm2.aarch64.rpm procps-ng-devel-3.3.17-1.cm2.aarch64.rpm procps-ng-lang-3.3.17-1.cm2.aarch64.rpm -pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm +pyproject-rpm-macros-1.0.0~rc1-3.cm2.noarch.rpm python-markupsafe-debuginfo-2.1.0-1.cm2.aarch64.rpm python3-3.9.13-3.cm2.aarch64.rpm python3-audit-3.0.6-7.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index e620591e09..942b924c69 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -497,7 +497,7 @@ procps-ng-3.3.17-1.cm2.x86_64.rpm procps-ng-debuginfo-3.3.17-1.cm2.x86_64.rpm procps-ng-devel-3.3.17-1.cm2.x86_64.rpm procps-ng-lang-3.3.17-1.cm2.x86_64.rpm -pyproject-rpm-macros-1.0.0~rc1-2.cm2.noarch.rpm +pyproject-rpm-macros-1.0.0~rc1-3.cm2.noarch.rpm python-markupsafe-debuginfo-2.1.0-1.cm2.x86_64.rpm python3-3.9.13-3.cm2.x86_64.rpm python3-audit-3.0.6-7.cm2.x86_64.rpm