Compare commits

..

No commits in common. 'i10ce' and 'c9' have entirely different histories.
i10ce ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/YAML-LibYAML-0.89.tar.gz SOURCES/YAML-LibYAML-0.82.tar.gz

@ -1 +1 @@
0e4e3315909953ecb3d8aab3e2e756565f9e25e7 SOURCES/YAML-LibYAML-0.89.tar.gz 92ba858a2594e7e18472cc03e91b12dc921810a9 SOURCES/YAML-LibYAML-0.82.tar.gz

@ -7,10 +7,10 @@
Name: perl-YAML-LibYAML Name: perl-YAML-LibYAML
Epoch: 1 Epoch: 1
Version: 0.89 Version: 0.82
Release: 2%{?dist} Release: 6%{?dist}
Summary: Perl YAML Serialization using XS and libyaml Summary: Perl YAML Serialization using XS and libyaml
License: GPL-1.0-or-later OR Artistic-1.0-Perl License: GPL+ or Artistic
URL: https://metacpan.org/release/YAML-LibYAML URL: https://metacpan.org/release/YAML-LibYAML
Source0: https://cpan.metacpan.org/modules/by-module/YAML/YAML-LibYAML-%{version}.tar.gz Source0: https://cpan.metacpan.org/modules/by-module/YAML/YAML-LibYAML-%{version}.tar.gz
Patch0: YAML-LibYAML-0.79-Unbundled-libyaml.patch Patch0: YAML-LibYAML-0.79-Unbundled-libyaml.patch
@ -50,64 +50,44 @@ BuildRequires: perl(File::Find)
BuildRequires: perl(File::Path) BuildRequires: perl(File::Path)
BuildRequires: perl(Filter::Util::Call) BuildRequires: perl(Filter::Util::Call)
BuildRequires: perl(FindBin) BuildRequires: perl(FindBin)
BuildRequires: perl(if)
BuildRequires: perl(IO::File) BuildRequires: perl(IO::File)
BuildRequires: perl(IO::Pipe) BuildRequires: perl(IO::Pipe)
BuildRequires: perl(lib) BuildRequires: perl(lib)
BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::Builder)
BuildRequires: perl(Test::More) >= 0.90 BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(Tie::Array) BuildRequires: perl(Tie::Array)
BuildRequires: perl(Tie::Hash) BuildRequires: perl(Tie::Hash)
BuildRequires: perl(utf8) BuildRequires: perl(utf8)
# A build cycle: perl-YAML-LibYAML → perl-boolean → perl-JSON-MaybeXS %if %{with perl_YAML_LibYAML_enables_optional_test}
# → perl-Cpanel-JSON-XS → perl-YAML-LibYAML
%if %{with perl_YAML_LibYAML_enables_optional_test} && !%{defined perl_bootstrap}
# Optional Tests # Optional Tests
BuildRequires: perl(boolean)
BuildRequires: perl(Path::Class) BuildRequires: perl(Path::Class)
%endif %endif
# Dependencies # Dependencies
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(B::Deparse) Requires: perl(B::Deparse)
Requires: libyaml >= 0.2.4 Requires: libyaml >= 0.2.4
# Avoid provides for perl shared objects # Avoid provides for perl shared objects
%{?perl_default_filter} %{?perl_default_filter}
# Filter modules bundled for tests
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(TestYAML.*\\)
%description %description
Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C
library is written precisely to the YAML 1.1 specification. It was originally library is written precisely to the YAML 1.1 specification. It was originally
bound to Python and was later bound to Ruby. bound to Python and was later bound to Ruby.
%package tests
Summary: Tests for %{name}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl-Test-Harness
%description tests
Tests from %{name}. Execute them
with "%{_libexecdir}/%{name}/test".
%prep %prep
%setup -q -n YAML-LibYAML-%{version} %setup -q -n YAML-LibYAML-%{version}
# Unbundled libyaml, the source files are the same as in libyaml-0.2.4 # Unbundled libyaml, the source files are the same as in libyaml-0.2.4
# It was determined by comparing commits in upstream repo: # It was determined by comparing commits in upstream repo:
# https://github.com/yaml/libyaml/ # https://github.com/yaml/libyaml/
%patch -P 0 -p1 -b .orig %patch0 -p1 -b .orig
for file in api.c dumper.c emitter.c loader.c parser.c reader.c scanner.c \ for file in api.c dumper.c emitter.c loader.c parser.c reader.c scanner.c \
writer.c yaml.h yaml_private.h; do writer.c yaml.h yaml_private.h; do
rm LibYAML/$file rm LibYAML/$file
sed -i -e "/^LibYAML\/$file/d" MANIFEST sed -i -e "/^LibYAML\/$file/d" MANIFEST
done done
# Help generators to recognize Perl scripts
for F in t/*.t; do
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
chmod +x "$F"
done
%build %build
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERLLOCAL=1 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERLLOCAL=1
@ -118,32 +98,7 @@ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERL
find %{buildroot} -type f -name '*.bs' -empty -delete find %{buildroot} -type f -name '*.bs' -empty -delete
%{_fixperms} -c %{buildroot} %{_fixperms} -c %{buildroot}
# Install tests
mkdir -p %{buildroot}%{_libexecdir}/%{name}
cp -a t %{buildroot}%{_libexecdir}/%{name}
# It needs libraries in lib/ not in system directories
rm %{buildroot}%{_libexecdir}/%{name}/t/000-require-modules.t
# Remove author test
rm %{buildroot}%{_libexecdir}/%{name}/t/author-pod-syntax.t
# Don't use blib
perl -i -pe 's{^use blib;}{#use blib;}' %{buildroot}%{_libexecdir}/%{name}/t/TestYAML.pm
perl -i -pe 's{^use_blib: 1}{use_blib: 0}' %{buildroot}%{_libexecdir}/%{name}/t/yaml_tests.yaml
cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
#!/bin/bash
set -e
# Some tests write into temporary files/directories. The solution is to
# copy the tests into a writable directory and execute them from there.
DIR=$(mktemp -d)
pushd "$DIR"
cp -a %{_libexecdir}/%{name}/* ./
prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
popd
rm -rf "$DIR"
EOF
chmod +x %{buildroot}%{_libexecdir}/%{name}/test
%check %check
export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
make test make test
%files %files
@ -155,77 +110,13 @@ make test
%{_mandir}/man3/YAML::XS.3* %{_mandir}/man3/YAML::XS.3*
%{_mandir}/man3/YAML::XS::LibYAML.3* %{_mandir}/man3/YAML::XS::LibYAML.3*
%files tests
%{_libexecdir}/%{name}
%changelog %changelog
* Sat Jan 04 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.89-2 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.82-6
- Rebuilt for MSVSphere 10 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Feb 02 2024 Petr Pisar <ppisar@redhat.com> - 1:0.89-2
- Break a build cycle: perl-YAML-LibYAML → perl-boolean → perl-JSON-MaybeXS
→ perl-Cpanel-JSON-XS → perl-YAML-LibYAML
* Sat Jan 27 2024 Paul Howarth <paul@city-fan.org> - 1:0.89-1
- Update to 0.89 (rhbz#2260595)
- Recognise core booleans on Perl 5.36+ at dump time (GH#114)
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.88-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.88-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.88-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.88-2
- Perl 5.38 rebuild
* Fri May 12 2023 Paul Howarth <paul@city-fan.org> - 1:0.88-1
- Update to 0.88
- REVERT "Turn off internal POK flag for number scalars"
* Fri May 5 2023 Paul Howarth <paul@city-fan.org> - 1:0.87-1
- Update to 0.87
- Turn off internal POK flag for number scalars
- Avoid use of deprecated patch syntax
* Thu Jan 26 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.86-1
- 0.86 bump
- Package tests
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.85-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Sep 13 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.85-1
- Update to 0.85 (rhbz#2126164)
- Convert doc from Swim to Markdown
* Mon Sep 5 2022 Paul Howarth <paul@city-fan.org> - 1:0.84-1
- Update to 0.84 (rhbz#2124002)
- Add option ForbidDuplicateKeys (GH#105)
- Use SPDX-format license tag
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.83-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue May 31 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.83-5
- Perl 5.36 rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.83-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.83-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.83-2
- Perl 5.34 rebuild
* Sun May 9 2021 Paul Howarth <paul@city-fan.org> - 1:0.83-1 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.82-5
- Update to 0.83 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
- Recognize tied variables (GH#101)
- Add license file from included libyaml code (GH#102)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.82-4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.82-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save