!6 Package upgrade
From: @wk333 Reviewed-by: @shinwell_hu Signed-off-by: @shinwell_hu
This commit is contained in:
commit
6f4339d743
25
0001-File-Find-Rule-Perl-1.16-fedora.patch
Normal file
25
0001-File-Find-Rule-Perl-1.16-fedora.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 19b0e905fa82b6972cb10e7382839251c31c9c95 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
|
||||||
|
Date: Mon, 4 Apr 2022 12:48:28 +0200
|
||||||
|
Subject: [PATCH] File-Find-Rule-Perl-1.16-fedora
|
||||||
|
|
||||||
|
---
|
||||||
|
t/03_no_index.t | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/t/03_no_index.t b/t/03_no_index.t
|
||||||
|
index b88f7d2..e31da26 100644
|
||||||
|
--- a/t/03_no_index.t
|
||||||
|
+++ b/t/03_no_index.t
|
||||||
|
@@ -39,6 +39,8 @@ SCOPE: {
|
||||||
|
Makefile.old
|
||||||
|
};
|
||||||
|
my @files = sort grep {
|
||||||
|
+ ! /^(debug|elf).*\.list/
|
||||||
|
+ and
|
||||||
|
! /^debian\b/
|
||||||
|
and
|
||||||
|
! /(?:^|\W)\.\w/
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 69e99e644a0a3e5cb57b87f5be56e00cd00a252b Mon Sep 17 00:00:00 2001
|
|
||||||
From: lingsheng <lingsheng@huawei.com>
|
|
||||||
Date: Wed, 30 Jun 2021 16:30:00 +0800
|
|
||||||
Subject: [PATCH] Add ignore files to fix test fail
|
|
||||||
|
|
||||||
---
|
|
||||||
t/03_no_index.t | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/t/03_no_index.t b/t/03_no_index.t
|
|
||||||
index be0a3bb..c5cfae5 100644
|
|
||||||
--- a/t/03_no_index.t
|
|
||||||
+++ b/t/03_no_index.t
|
|
||||||
@@ -36,6 +36,12 @@ SCOPE: {
|
|
||||||
pm_to_blib
|
|
||||||
MYMETA.yml
|
|
||||||
MYMETA.json
|
|
||||||
+ debugfiles.list
|
|
||||||
+ debuglinks.list
|
|
||||||
+ debugsourcefiles.list
|
|
||||||
+ debugsources.list
|
|
||||||
+ elfbins.list
|
|
||||||
+ filelist.lst
|
|
||||||
};
|
|
||||||
my @files = sort grep {
|
|
||||||
! /^debian\b/
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
File-Find-Rule-Perl-1.16.tar.gz
Normal file
BIN
File-Find-Rule-Perl-1.16.tar.gz
Normal file
Binary file not shown.
@ -1,13 +1,14 @@
|
|||||||
%global _empty_manifest_terminate_build 0
|
%global _empty_manifest_terminate_build 0
|
||||||
Name: perl-File-Find-Rule-Perl
|
Name: perl-File-Find-Rule-Perl
|
||||||
Version: 1.15
|
Version: 1.16
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Common rules for searching for Perl things
|
Summary: Common rules for searching for Perl things
|
||||||
License: GPL+ or Artistic
|
License: GPL-1.0-or-later or Artistic-1.0
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://search.cpan.org/dist/File-Find-Rule-Perl/
|
URL: http://search.cpan.org/dist/File-Find-Rule-Perl/
|
||||||
Source0: http://www.cpan.org/authors/id/E/ET/ETHER/File-Find-Rule-Perl-%{version}.tar.gz
|
Source0: http://www.cpan.org/authors/id/E/ET/ETHER/File-Find-Rule-Perl-%{version}.tar.gz
|
||||||
Patch0001: Add-ignore-files-to-fix-test-fail.patch
|
# Filter out the files rpm generates in sourcedir.
|
||||||
|
Patch0001: 0001-File-Find-Rule-Perl-1.16-fedora.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: perl >= 0:5.006
|
BuildRequires: perl >= 0:5.006
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
@ -36,51 +37,30 @@ File::Find::Rule pattern.
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -n File-Find-Rule-Perl-%{version} -p1
|
%autosetup -n File-Find-Rule-Perl-%{version} -p1
|
||||||
%build
|
%build
|
||||||
export PERL_MM_OPT=""
|
%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||||
%{__perl} Makefile.PL INSTALLDIRS=vendor
|
%{make_build}
|
||||||
make %{?_smp_mflags}
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
export PERL_MM_OPT=""
|
%{make_install} DESTDIR="$RPM_BUILD_ROOT"
|
||||||
rm -rf $RPM_BUILD_ROOT
|
%{_fixperms} "$RPM_BUILD_ROOT"/*
|
||||||
|
|
||||||
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
|
|
||||||
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
|
|
||||||
|
|
||||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
|
||||||
|
|
||||||
pushd %{buildroot}
|
|
||||||
touch filelist.lst
|
|
||||||
if [ -d usr/bin ];then
|
|
||||||
find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
|
|
||||||
fi
|
|
||||||
if [ -d usr/sbin ];then
|
|
||||||
find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst
|
|
||||||
fi
|
|
||||||
if [ -d usr/lib64 ];then
|
|
||||||
find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst
|
|
||||||
fi
|
|
||||||
if [ -d usr/lib ];then
|
|
||||||
find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst
|
|
||||||
fi
|
|
||||||
popd
|
|
||||||
mv %{buildroot}/filelist.lst .
|
|
||||||
%check
|
%check
|
||||||
make test
|
make test
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%files -f filelist.lst
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc Changes META.json
|
%doc Changes
|
||||||
%{perl_vendorlib}/*
|
%{perl_vendorlib}/*
|
||||||
%files help
|
%files help
|
||||||
%{_mandir}/*
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 21 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.16-1
|
||||||
|
- Upgrade to version 1.16
|
||||||
|
|
||||||
* Wed Jun 30 2021 lingsheng <lingsheng@huawei.com> 1.15-2
|
* Wed Jun 30 2021 lingsheng <lingsheng@huawei.com> 1.15-2
|
||||||
- Add ignore files to fix test fail
|
- Add ignore files to fix test fail
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user