Merge branch 'epel7'

Conflicts:
	perl-Sub-Name.spec
This commit is contained in:
Paul Howarth 2014-07-11 16:17:36 +01:00
commit a630775a58
3 changed files with 22 additions and 11 deletions

View File

@ -8,10 +8,10 @@ diff --git a/Name.xs b/Name.xs
index f6d7bc2..89d2dd8 100644
--- a/Name.xs
+++ b/Name.xs
@@ -64,6 +64,40 @@ subname(name, sub)
*end = saved;
name = end;
}
@@ -62,6 +62,40 @@ subname(name, sub)
stash = GvHV(gv_fetchpv(savepvn(name, end - name), TRUE, SVt_PVHV));
name = end;
}
+
+ /* under debugger, provide information about sub location */
+ if (PL_DBsub && CvGV(cv)) {

View File

@ -1,16 +1,19 @@
# TODO: BR: perl(B::C) when available
# Only need manual requires for "use base XXX;" prior to rpm 4.9
%global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e')
Name: perl-Sub-Name
Version: 0.05
Release: 11%{?dist}
Version: 0.06
Release: 1%{?dist}
Summary: Name - or rename - a sub
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Sub-Name/
Source0: http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Sub-Name-%{version}.tar.gz
Patch0: Sub-Name-0.05-cpan50524.patch
Source0: http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Sub-Name-%{version}.tar.gz
Patch0: Sub-Name-0.06-cpan50524.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: perl
BuildRequires: perl(base)
BuildRequires: perl(DynaLoader)
BuildRequires: perl(Exporter)
@ -49,7 +52,6 @@ rm -rf %{buildroot}
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
%{_fixperms} %{buildroot}
%check
@ -59,13 +61,22 @@ make test
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/auto/Sub/
%{perl_vendorarch}/Sub/
%{_mandir}/man3/Sub::Name.3pm*
%changelog
* Fri Jul 11 2014 Paul Howarth <paul@city-fan.org> - 0.06-1
- Update to 0.06
- Do not change the string arg in XS, use copy instead (CPAN RT#96893)
- Add README make target
- Add more distribution metadata
- This release by ETHER update source URL
- Update debugger patch (CPAN RT#96893)
- Drop %%defattr, redundant since rpm 4.4
- Don't need to remove empty directories from the buildroot
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.05-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
26077202597620e4a6068c8087f3e09f Sub-Name-0.05.tar.gz
b446cc3408072ada366eb0c5faf6833e Sub-Name-0.06.tar.gz