commit 3a041370e249b96b81022189e26d1c72a6ad395b Merge: 6a3655d c871d49 Author: Peter Robinson <pbrobinson@xxxxxxxxx> Date: Thu Feb 21 15:31:02 2013 +0000 Merge newer from F18, modernise SPEC .gitignore | 1 + RT-74392.patch | 21 +++++++++++++++++ col_0_fix.patch | 21 +++++++++++++++++ perl-HTML-FormatText-WithLinks-AndTables.spec | 31 ++++++++++++++---------- sources | 2 +- 5 files changed, 62 insertions(+), 14 deletions(-) --- diff --cc perl-HTML-FormatText-WithLinks-AndTables.spec index a76dda0,18fbb21..1ee85d3 --- a/perl-HTML-FormatText-WithLinks-AndTables.spec +++ b/perl-HTML-FormatText-WithLinks-AndTables.spec @@@ -1,13 -1,15 +1,16 @@@ Name: perl-HTML-FormatText-WithLinks-AndTables - Version: 0.01 - Release: 6%{?dist} + Version: 0.02 -Release: 2%{?dist} ++Release: 3%{?dist} Summary: Converts HTML to Text with tables in tact License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/ - Source0: http://www.cpan.org/authors/id/S/SF/SFRYER/HTML-FormatText-WithLinks-AndTables-%{version}.tar.gz - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch ++ + Source0: http://www.cpan.org/authors/id/S/SF/SFRYER/HTML-FormatText-WithLinks-AndTables-%{version}.tar.gz + Patch0: RT-74392.patch + Patch1: col_0_fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch ++ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(HTML::FormatText::WithLinks) BuildRequires: perl(HTML::TreeBuilder) @@@ -28,47 -30,40 +31,49 @@@ preserve multi-line text inside of a <T using <BR/> tags. %prep - %setup -q -n HTML-FormatText-WithLinks-AndTables-%{version} + %setup -q -n HTML-FormatText-WithLinks-AndTables + %patch0 -p 1 + %patch1 -p 1 %build --%{__perl} Makefile.PL INSTALLDIRS=vendor ++perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install --rm -rf $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/* ++fixperms $RPM_BUILD_ROOT/* %check make test --%clean --rm -rf $RPM_BUILD_ROOT -- %files --%defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog -* Tue Jul 24 2012 Jeff fearn <jfearn@xxxxxxxxxx> 0.02-1 ++* Thu Feb 21 2013 Peter Robinson <pbrobinson@xxxxxxxxxxxxxxxxx> 0.02-3 ++- Merge newer from F18, modernise SPEC ++ ++* Fri Feb 15 2013 Jeff fearn <jfearn@xxxxxxxxxx> 0.02-1 + - New Upstream + +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.01-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.01-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 21 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 0.01-4 +- Perl 5.16 rebuild + +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.01-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Jun 26 2011 Rüdiger Landmann <r.landmann@xxxxxxxxxx> 0.01-2 - rm duplicate Requires - verify license -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel