[perl-Test-Requires: 9/12] Merge branch 'el6'

Paul Howarth pghmcfc at fedoraproject.org
Thu Mar 22 19:14:38 UTC 2012


commit 9f7cf1670339a5be85b63c12b42e896713c9e320
Merge: 03f1747 78fcee9
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Mar 22 18:44:00 2012 +0000

    Merge branch 'el6'
    
    Conflicts:
    	perl-Test-Requires.spec

 perl-Test-Requires.spec |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)
---
diff --cc perl-Test-Requires.spec
index f7ee804,ebadbf0..8cf2d78
--- a/perl-Test-Requires.spec
+++ b/perl-Test-Requires.spec
@@@ -54,19 -58,21 +58,21 @@@ rm -rf %{buildroot
  %{_mandir}/man3/*.3*
  
  %changelog
- * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-3
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ * Wed Aug 17 2011 Paul Howarth <paul at city-fan.org> - 0.06-3
+ - BR: hunspell-en rather than aspell-en (#731272)
  
- * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ * Thu Nov 18 2010 Paul Howarth <paul at city-fan.org> - 0.06-2
 -- run release tests as well as standard test suite in %%check
 -- drop no-longer-needed buildreq perl(Filter::Util::Call)
 -- new buildreqs perl(Test::Perl::Critic), perl(Test::Pod), perl(Test::Spelling)
++- Run release tests as well as standard test suite in %%check
++- Drop no-longer-needed buildreq perl(Filter::Util::Call)
++- New buildreqs perl(Test::Perl::Critic), perl(Test::Pod), perl(Test::Spelling)
  
--* Tue Oct 05 2010 Iain Arnell <iarnell at gmail.com> 0.06-1
--- update to latest upstream version
++* Tue Oct 05 2010 Iain Arnell <iarnell at gmail.com> - 0.06-1
++- Update to latest upstream version
  
  * Fri May 07 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.03-2
  - Mass rebuild with perl-5.12.0
  
--* Sat Mar 20 2010 Chris Weyl <cweyl at alumni.drew.edu> 0.03-1
--- specfile by Fedora::App::MaintainerTools 0.006
++* Sat Mar 20 2010 Chris Weyl <cweyl at alumni.drew.edu> - 0.03-1
++- Specfile by Fedora::App::MaintainerTools 0.006
  
  



More information about the perl-devel mailing list