commit e226341a9f96209e9b193c1627c5b90a80ab8a23 Merge: c4715dc c2ced08 Author: Ruediger Landmann <r.landmann@xxxxxxxxxx> Date: Wed Aug 6 17:04:47 2014 +1000 new upstream .gitignore | 6 +++++ perl-XML-TreeBuilder.spec | 55 ++++++++++++++++++++++++++------------------ sources | 4 +++ 3 files changed, 42 insertions(+), 23 deletions(-) --- diff --cc .gitignore index b243d95,d50ba51..87a7624 --- a/.gitignore +++ b/.gitignore @@@ -1,3 -1,5 +1,9 @@@ XML-TreeBuilder-3.09.tar.gz /XML-TreeBuilder-4.0.tar.gz ++<<<<<<< HEAD +/XML-TreeBuilder-5.4.tar.gz ++======= + /XML-TreeBuilder-4.2.tar.gz + /XML-TreeBuilder-5.0.tar.gz + /XML-TreeBuilder-5.1.tar.gz ++>>>>>>> c2ced084ca0889396f28a47aaa6655a188a4fd0b diff --cc perl-XML-TreeBuilder.spec index c6c4ad0,0a2a89d..320aeb9 --- a/perl-XML-TreeBuilder.spec +++ b/perl-XML-TreeBuilder.spec @@@ -48,26 -54,20 +54,29 @@@ find $RPM_BUILD_ROOT -type d -depth -ex %{perl_vendorlib}/XML/ %changelog +* Wed Aug 6 2014 Rüdiger Landmann <r.landmann@xxxxxxxxxx> - 5.4-0 +- new upstream + + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 5.1-1 + - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + + * Mon Oct 28 2013 Jeff Fearn <jfearn@xxxxxxxxxx> - 5.1-0 + - Fix entities in attributes only working for root node. RT #89402 + + * Fri Oct 04 2013 Jeff Fearn <jfearn@xxxxxxxxxx> - 5.0-0 + - Support entity expansion. + + * Fri Jan 25 2013 Jeff Fearn <jfearn@xxxxxxxxxx> - 4.1-0 + - Support XML::Parser ParseParamEnt parameter + +* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@xxxxxxxxxx> - 4.0-3 +- Add Test::More to build requires + +* Thu Dec 23 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 4.0-2 +- 661697 rebuild for fixing problems with vendorach/lib + - * Thu Dec 02 2010 Jeff Fearn <jfearn@xxxxxxxxxx> - 4.0-1 - - New upstream - - * Fri May 07 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 3.09-19 - - Mass rebuild with perl-5.12.0 - - * Mon Dec 7 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 3.09-18 - - rebuild against perl 5.10.1 - - * Mon Nov 16 2009 Jeff Fearn <jfearn@xxxxxxxxxx> - 3.09-17 - - Fix Requires + * Mon Jun 21 2010 Jeff Fearn <jfearn@xxxxxxxxxx> - 4.0-1 + - new upstream version. * Tue Sep 29 2009 Jeff Fearn <jfearn@xxxxxxxxxx> - 3.09-16 - Stupid man! Don't eat entities :( diff --cc sources index 90c3684,6b3b6f7..b6070fd --- a/sources +++ b/sources @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +bf2d9102b62516f6e76c248acb9e8a2c XML-TreeBuilder-5.4.tar.gz ++======= + 05a08a652fa2861cb56ce50c1b89eb40 XML-TreeBuilder-5.1.tar.gz ++>>>>>>> c2ced084ca0889396f28a47aaa6655a188a4fd0b -- 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