From c41a6a752c6c4b18446f0c264e9d14eea14a99f1 Mon Sep 17 00:00:00 2001 From: weiwei_tiantian Date: Thu, 2 Jun 2022 10:51:27 +0800 Subject: [PATCH] move perl-encoding from perl-Encode-devel to perl-Encode (cherry picked from commit 3d2de5d5eac1213f4bcbaca2d9fb320476fa1321) --- perl-Encode.spec | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/perl-Encode.spec b/perl-Encode.spec index 24ef5d9..dde89f2 100644 --- a/perl-Encode.spec +++ b/perl-Encode.spec @@ -2,7 +2,7 @@ Name: perl-Encode Epoch: 4 Version: %{cpan_version} -Release: 2 +Release: 3 Summary: Character encodings in Perl License: (GPL+ or Artistic) and Artistic 2.0 and UCD URL: https://metacpan.org/release/Encode @@ -13,7 +13,12 @@ BuildRequires: perl(MIME::Base64) perl(overload) perl(parent) perl(re) perl(Sto BuildRequires: perl(charnames) perl(File::Compare) perl(File::Copy) perl(FileHandle) perl(FindBin) perl(IO::Select) perl(IPC::Open3) BuildRequires: perl(lib) perl(open) perl(Scalar::Util) perl(Symbol) perl(Test::More) perl(Tie::Scalar) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) perl(parent) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) perl(parent) perl(Carp) perl(Filter::Util::Call) +Suggests: perl(PerlIO::encoding) +Requires: perl(utf8) +Conflicts: perl-Encode < 1:2.64-2 +Provides: perl-encoding +Obsoletes: perl-encoding %{?perl_default_filter} %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((Encode::ConfigLocal|MY)\\) @@ -23,24 +28,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) The Encode module provides the interface between Perl strings and the rest of the system. Perl strings are sequences of characters. -%package devel -Summary: Perl Encode Module Generator -Version: %{cpan_version} -License: (GPL+ or Artistic) and UCD -Requires: %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release} perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Recommends: perl-devel%{?_isa} -Requires: perl(Encode) perl(Carp) perl(Filter::Util::Call) -Suggests: perl(PerlIO::encoding) -Requires: perl(utf8) -Conflicts: perl-Encode < 1:2.64-2 -Provides: perl-encoding -Obsoletes: perl-encoding - -%description devel -enc2xs builds a Perl extension for use by Encode from either Unicode Character -Mapping files (.ucm) or Tcl Encoding Files (.enc). You can use enc2xs to add -your own encoding to perl. No knowledge of XS is necessary. - With the encoding pragma, you can write your Perl script in any encoding you like (so long as the Encode module supports it) and still enjoy Unicode support. @@ -51,6 +38,19 @@ be removed in a future version. The easiest and the best alternative is to write your script in UTF-8. +%package devel +Summary: Perl Encode Module Generator +Version: %{cpan_version} +License: (GPL+ or Artistic) and UCD +Requires: %{name}%{?_isa} = %{epoch}:%{cpan_version}-%{release} perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Recommends: perl-devel%{?_isa} +Requires: perl(Encode) + +%description devel +enc2xs builds a Perl extension for use by Encode from either Unicode Character +Mapping files (.ucm) or Tcl Encoding Files (.enc). You can use enc2xs to add +your own encoding to perl. No knowledge of XS is necessary. + %package_help %prep @@ -77,12 +77,12 @@ make test %{perl_vendorarch}/Encode* %exclude %{perl_vendorarch}/Encode/*.e2x %exclude %{perl_vendorarch}/Encode/encode.h +%{perl_vendorarch}/encoding.pm %files devel %{_bindir}/enc2xs %{perl_vendorarch}/Encode/*.e2x %{perl_vendorarch}/Encode/encode.h -%{perl_vendorarch}/encoding.pm %files help %{_mandir}/man1/enc2xs.* @@ -93,6 +93,9 @@ make test %{_mandir}/man3/Encode::* %changelog +* Thu Jun 02 2022 tianwei - 4:3.16-3 +- Move perl-encoding from perl-Encode-devel to perl-Encode,to minimize extra dependency + * Tue Apr 26 2022 renhongxun - 4:3.16-2 - upgrade epoch to 4