commit acb7e7722385260be02656727d02ca1e6860facd
Merge: 20a6fb2 a5c65eb
Author: Nicholas van Oudtshoorn <vanoudt@xxxxxxxxx>
Date: Fri May 31 10:12:48 2013 +0800
Merge branch 'master' of ssh://pkgs.fedoraproject.org/perl-Authen-CAS-Client
Conflicts:
perl-Authen-CAS-Client.spec
perl-Authen-CAS-Client.spec | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --cc perl-Authen-CAS-Client.spec
index 5392063,4c85c5a..1cf738b
--- a/perl-Authen-CAS-Client.spec
+++ b/perl-Authen-CAS-Client.spec
@@@ -45,8 -46,19 +46,23 @@@ make tes
%{_mandir}/man3/*
%changelog
++<<<<<<< HEAD
+* Fri May 31 2013 Nicholas van Oudtshoorn <vanoudt@xxxxxxxxx> - 0.06-1
+- New upstream release
++
+ * Sat Feb 23 2013 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 0.05-6
+ - Pass --skipdeps to prevent ExtUtils::AutoInstall from accessing CPAN.
+ (Fix FTBFS #914242).
+
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.05-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.05-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.05-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon Nov 28 2011 Nicholas van Oudtshoorn <vanoudt@xxxxxxxxx> - 0.05-2
- Specfile cleanups
* Thu Apr 28 2011 Nicholas van Oudtshoorn <vanoudt@xxxxxxxxx> - 0.05-1
--
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
