commit 0f8d0dd1f16743c041b0d307997f882a1fda9e01
Merge: c3ae611 e6b2bf0
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Sat Mar 24 09:52:16 2012 +0000
Merge branch 'el6'
Conflicts:
perl-Test-Unit-Lite.spec
.gitignore | 2 +-
perl-Test-Unit-Lite.spec | 85 ++++++++++++++++++++++++----------------------
2 files changed, 45 insertions(+), 42 deletions(-)
---
diff --cc .gitignore
index d53886d,d53886d..c7029df
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
--Test-Unit-Lite-0.12.tar.gz
++/Test-Unit-Lite-[0-9.]*.tar.gz
diff --cc perl-Test-Unit-Lite.spec
index af701f2,764d7aa..fbae9c0
--- a/perl-Test-Unit-Lite.spec
+++ b/perl-Test-Unit-Lite.spec
@@@ -81,20 -84,20 +84,20 @@@ rm -rf %{buildroot
- Mass rebuild with perl-5.12.0
* Fri Dec 4 2009 Stepan Kasal <skasal@xxxxxxxxxx> - 1:0.12-3
--- rebuild against perl 5.10.1
++- Rebuild against perl 5.10.1
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1:0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--* Mon Jun 08 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> 0.12-1
--- auto-update to 0.12 (by cpan-spec-update 0.01)
++* Mon Jun 08 2009 Chris Weyl <cweyl@xxxxxxxxxxxxxxx> - 1:0.12-1
++- Auto-update to 0.12 (by cpan-spec-update 0.01)
- Add epoch of 1 (0.1101 => 0.12)
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.1101-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--* Thu Feb 12 2009 Allisson Azevedo <allisson@xxxxxxxxx> 0.1101-2
--- Added filter provides.
++* Thu Feb 12 2009 Allisson Azevedo <allisson@xxxxxxxxx> - 0.1101-2
++- Added filter provides
--* Thu Jan 29 2009 Allisson Azevedo <allisson@xxxxxxxxx> 0.1101-1
--- Initial rpm release.
++* Thu Jan 29 2009 Allisson Azevedo <allisson@xxxxxxxxx> - 0.1101-1
++- Initial rpm release
--
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
