Compare commits

...

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

8 changed files with 14 additions and 117 deletions

View File

@ -1 +0,0 @@
1

4
.gitignore vendored
View File

@ -7,7 +7,3 @@ JSON-XS-2.27.tar.gz
/JSON-XS-3.02.tar.gz /JSON-XS-3.02.tar.gz
/JSON-XS-3.03.tar.gz /JSON-XS-3.03.tar.gz
/JSON-XS-3.04.tar.gz /JSON-XS-3.04.tar.gz
/JSON-XS-4.0.tar.gz
/JSON-XS-4.01.tar.gz
/JSON-XS-4.02.tar.gz
/JSON-XS-4.03.tar.gz

View File

@ -1,7 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

View File

@ -1,3 +0,0 @@
from Config import *
addFilter("spelling-error Summary\(en_US\) de -> ")
addFilter("spelling-error %description -l en_US versa -> ")

View File

@ -1,11 +1,12 @@
Name: perl-JSON-XS Name: perl-JSON-XS
Summary: JSON serializing/de-serializing, done correctly and fast Summary: JSON serializing/de-serializing, done correctly and fast
Epoch: 1 Epoch: 1
Version: 4.03 Version: 3.04
Release: 5%{?dist} Release: 3%{?dist}
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/JSON-XS Group: Development/Libraries
Source0: https://cpan.metacpan.org/modules/by-module/JSON/JSON-XS-%{version}.tar.gz URL: http://search.cpan.org/dist/JSON-XS/
Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{version}.tar.gz
# Build # Build
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: gcc BuildRequires: gcc
@ -14,7 +15,6 @@ BuildRequires: perl-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: perl(Canary::Stability) BuildRequires: perl(Canary::Stability)
BuildRequires: perl(Config)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: sed BuildRequires: sed
# Module Runtime # Module Runtime
@ -39,119 +39,40 @@ BuildRequires: perl(warnings)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%{?perl_default_filter} %{?perl_default_filter}
%{?perl_default_subpackage_tests}
%description %description
This module converts Perl data structures to JSON and vice versa. Its This module converts Perl data structures to JSON and vice versa. Its
primary goal is to be correct and its secondary goal is to be fast. To primary goal is to be correct and its secondary goal is to be fast. To
reach the latter goal it was written in C. reach the latter goal it was written in C.
%package tests
Summary: Tests for %{name}
BuildArch: noarch
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 JSON-XS-%{version} %setup -q -n JSON-XS-%{version}
sed -i 's/\r//' t/* sed -i 's/\r//' t/*
perl -MConfig -pi -e 's|^#!/opt/bin/perl|$Config{startperl}|' eg/* perl -pi -e 's|^#!/opt/bin/perl|#!%{__perl}|' eg/*
chmod -c -x eg/* chmod -c -x eg/*
# Help generators to recognize Perl scripts
for F in t/*.t; do
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F"
chmod +x "$F"
done
%build %build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERLLOCAL=1 </dev/null %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
%{make_build} make %{?_smp_mflags}
%install %install
%{make_install} make pure_install DESTDIR=%{buildroot}
# Install tests
mkdir -p %{buildroot}%{_libexecdir}/%{name}
cp -a t %{buildroot}%{_libexecdir}/%{name}
cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
#!/bin/sh
cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
EOF
chmod +x %{buildroot}%{_libexecdir}/%{name}/test
# Correct permissions
%{_fixperms} -c %{buildroot} %{_fixperms} -c %{buildroot}
%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
%doc Changes README eg/ %doc Changes README eg/
%license COPYING %license COPYING
%{_bindir}/json_xs %{perl_vendorarch}/*
%{perl_vendorarch}/auto/JSON/ %exclude %dir %{perl_vendorarch}/auto
%{perl_vendorarch}/JSON/ %{_bindir}/*
%{_mandir}/man[13]/* %{_mandir}/man[13]/*
%files tests
%{_libexecdir}/%{name}
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.03-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.03-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Feb 22 2021 Petr Pisar <ppisar@redhat.com> - 1:4.03-3
- Package tests manually
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.03-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Oct 28 2020 Paul Howarth <paul@city-fan.org> - 1:4.03-1
- Update to 4.03
- Use %%{make_build} and %%{make_install}
- Simplify files list a bit
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.02-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:4.02-5
- Perl 5.32 rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.02-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.02-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:4.02-2
- Perl 5.30 rebuild
* Wed Mar 6 2019 Paul Howarth <paul@city-fan.org> - 1:4.02-1
- Update to 4.02
* Mon Feb 25 2019 Paul Howarth <paul@city-fan.org> - 1:4.01-1
- Update to 4.01
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Paul Howarth <paul@city-fan.org> - 1:4.0-1
- Update to 4.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.04-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:3.04-4
- Perl 5.28 rebuild
* Wed Feb 21 2018 Paul Howarth <paul@city-fan.org> - 1:3.04-3 * Wed Feb 21 2018 Paul Howarth <paul@city-fan.org> - 1:3.04-3
- Specify all dependencies - Specify all dependencies

View File

@ -1,5 +0,0 @@
summary: Sanity tests
discover:
how: fmf
execute:
how: tmt

View File

@ -1 +1 @@
SHA512 (JSON-XS-4.03.tar.gz) = 7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155 SHA512 (JSON-XS-3.04.tar.gz) = 69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db

View File

@ -1,4 +0,0 @@
summary: Upstream tests
component: perl-JSON-XS
require: perl-JSON-XS-tests
test: /usr/libexec/perl-JSON-XS/test