diff --git a/Encode-JIS2K-0.02.tar.gz b/Encode-JIS2K-0.02.tar.gz deleted file mode 100644 index 0bd5a96..0000000 --- a/Encode-JIS2K-0.02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d718add5857f37fc270f24360bc9d100b72e0e13a11ca3149fe4e4d7c7cc4bf -size 401178 diff --git a/Encode-JIS2K-0.03.tar.gz b/Encode-JIS2K-0.03.tar.gz new file mode 100644 index 0000000..e714a25 --- /dev/null +++ b/Encode-JIS2K-0.03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc +size 419693 diff --git a/perl-Encode-JIS2K.changes b/perl-Encode-JIS2K.changes index 7278059..1591688 100644 --- a/perl-Encode-JIS2K.changes +++ b/perl-Encode-JIS2K.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Sep 25 16:05:05 UTC 2018 - pmonrealgonzalez@suse.com + +- update to 0.03 + Revision: 0.03 $ $Date: 2015/06/05 03:57:30 $ + ! Makefile.PL + fix RT#67531 & RT#104967 + https://rt.cpan.org/Ticket/Display.html?id=67531 + https://rt.cpan.org/Ticket/Display.html?id=104967 + ! lib/Encode/JIS2K/2022JP3.pm + fix RT#73401 + https://rt.cpan.org/Ticket/Display.html?id=73401 + +- Dropped patch fixed upstream + * reproducible.patch + +- Cleaned with spec-cleaner + ------------------------------------------------------------------- Mon Jul 3 10:58:01 UTC 2017 - bwiedemann@suse.com diff --git a/perl-Encode-JIS2K.spec b/perl-Encode-JIS2K.spec index 33c7988..19e77e6 100644 --- a/perl-Encode-JIS2K.spec +++ b/perl-Encode-JIS2K.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Encode-JIS2K # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,48 +16,39 @@ # +%define cpan_name Encode-JIS2K Name: perl-Encode-JIS2K -Requires: /usr/bin/enc2xs -Version: 0.02 +Version: 0.03 Release: 0 -Url: http://search.cpan.org/~dankogai/Encode-JIS2K-0.02/ -Source0: http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.02.tar.gz -Patch0: perl-Encode-JIS2K.patch -# PATCH-FIX-UPSTREAM in 0.03 -Patch1: reproducible.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: JIS X 0212 (aka JIS 2000) Encodings License: Artistic-1.0 Group: Development/Libraries/Perl -%{perl_requires} +Url: https://metacpan.org/pod/Encode::JIS2K +Source0: https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/%{cpan_name}-%{version}.tar.gz +Patch0: perl-Encode-JIS2K.patch BuildRequires: perl BuildRequires: perl-macros +Requires: %{_bindir}/enc2xs +%{perl_requires} %description This module implements encodings that covers JIS X 0213 charset (AKA JIS 2000, hence the module name). - - -Authors: --------- - Dan Kogai - -%define __find_provides /usr/lib/rpm/find-provides -%define __find_requires /usr/lib/rpm/find-requires +%define __find_provides %{_prefix}/lib/rpm/find-provides +%define __find_requires %{_prefix}/lib/rpm/find-requires %prep %setup -q -n Encode-JIS2K-%{version} %patch0 -p1 -%patch1 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL +CFLAGS="%{optflags}" perl Makefile.PL make %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/%{perl_archlib} -make DESTDIR=$RPM_BUILD_ROOT install_vendor +install -d %{buildroot}/%{perl_archlib} +make DESTDIR=%{buildroot} install_vendor %perl_process_packlist %post @@ -68,8 +59,7 @@ if [ $1 = 0 ]; then enc2xs -C > /dev/null 2>&1 fi -%files -%defattr(-,root,root) +%files %doc Changes MANIFEST README* %{_mandir}/man3/*.3pm.gz %{perl_vendorarch}/Encode/ diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index dbcab7d..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,54 +0,0 @@ -Sort hash keys list - -because we want reproducible output -even though hash order is undeterministic - -See https://reproducible-builds.org/ for why this is good. -Index: Encode-JIS2K-0.02/Makefile.PL -=================================================================== ---- Encode-JIS2K-0.02.orig/Makefile.PL -+++ Encode-JIS2K-0.02/Makefile.PL -@@ -73,7 +73,7 @@ sub post_initialize - $self->{'C'} = ["$name.c"]; - # $self->{'H'} = [$self->catfile($self->updir,'encode.h')]; - my %xs; -- foreach my $table (keys %tables) { -+ foreach my $table (sort keys %tables) { - push (@{$self->{'C'}},"$table.c"); - # Do NOT add $table.h etc. to H_FILES unless we own up as to how they - # get built. -@@ -91,7 +91,7 @@ sub post_initialize - #define U8 U8 - #include "encode.h" - END -- foreach my $table (keys %tables) { -+ foreach my $table (sort keys %tables) { - print XS qq[#include "${table}.h"\n]; - } - print XS <<"END"; -@@ -120,7 +120,7 @@ PROTOTYPES: DISABLE - BOOT: - { - END -- foreach my $table (keys %tables) { -+ foreach my $table (sort keys %tables) { - print XS qq[#include "${table}.exh"\n]; - } - print XS "}\n"; -@@ -134,14 +134,14 @@ sub postamble - my $dir = "."; # $self->catdir('Encode'); - my $str = "# $name\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n"; - $str .= "$name.c : $name.xs "; -- foreach my $table (keys %tables) -+ foreach my $table (sort keys %tables) - { - $str .= " $table.c"; - } - $str .= "\n\n"; - $str .= "$name\$(OBJ_EXT) : $name.c\n\n"; - -- foreach my $table (keys %tables) -+ foreach my $table (sort keys %tables) - { - my $numlines = 1; - my $lengthsofar = length($str);