diff --git a/.gitignore b/.gitignore index 8b42aa4..88306f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /Encode-JIS2K-0.02.tar.gz /Encode-JIS2K-0.03.tar.gz +/Encode-JIS2K-0.05.tar.gz diff --git a/perl-Encode-JIS2K.spec b/perl-Encode-JIS2K.spec index 06c640a..015e38e 100644 --- a/perl-Encode-JIS2K.spec +++ b/perl-Encode-JIS2K.spec @@ -1,10 +1,11 @@ Name: perl-Encode-JIS2K -Version: 0.03 -Release: 25%{?dist} +Version: 0.05 +Release: 1%{?dist} Summary: JIS X 0212 (aka JIS 2000) Encodings -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Encode-JIS2K Source0: https://cpan.metacpan.org/modules/by-module/Encode/Encode-JIS2K-%{version}.tar.gz + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc @@ -17,7 +18,7 @@ BuildRequires: perl(Encode) BuildRequires: perl(Encode::CJKConstants) BuildRequires: perl(Encode::Encoding) BuildRequires: perl(Encode::JP::H2Z) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) %{!?el7:>= 6.76} BuildRequires: perl(File::Basename) BuildRequires: perl(File::Compare) BuildRequires: perl(File::Spec) @@ -39,20 +40,22 @@ hence the module name). %setup -q -n Encode-JIS2K-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ + %{!?el7:NO_PACKLIST=1 NO_PERLLOCAL=1} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -# Remove the next line from noarch packages (unneeded) -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' -%{_fixperms} $RPM_BUILD_ROOT/* +%make_install +%if 0%{?el7} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' +%endif +%{_fixperms} %{buildroot}/* %check -make test +%make_build test %files %doc Changes README @@ -60,6 +63,9 @@ make test %exclude %dir %{perl_vendorarch}/auto/ %changelog +* Fri Nov 24 2023 Xavier Bachelot - 0.05-1 +- Update to 0.05 (RHBZ#2251183) + * Thu Jul 20 2023 Fedora Release Engineering - 0.03-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 8bacdf4..6895989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60539471aa408a2b793cd45a6ce651db Encode-JIS2K-0.03.tar.gz +SHA512 (Encode-JIS2K-0.05.tar.gz) = 967849b89f7ece6488ceb7ea394a6f4c1659f8d62939b3cf6e9ba8ec8328ba7c180194dcef534450af0f110c786e67489d39f914e015330d16cd4414e3440afe