Merge branch 'master' of ssh://pkgs.fedoraproject.org/beakerlib
Conflicts: beakerlib.spec
This commit is contained in:
commit
e4e4f4d6d0
@ -1,7 +1,12 @@
|
||||
Name: beakerlib
|
||||
Summary: A shell-level integration testing library
|
||||
<<<<<<< HEAD
|
||||
Version: 1.5
|
||||
Release: 1%{?dist}
|
||||
=======
|
||||
Version: 1.4
|
||||
Release: 2%{?dist}
|
||||
>>>>>>> f5ad9e3984cd736cf5d4a598351814d92919f59c
|
||||
License: GPLv2
|
||||
Group: Development/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
@ -51,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Wed May 02 2012 Petr Muller <pmuller@redhat.com> - 1.5-1
|
||||
- update to new upstream version
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Fri Jul 01 2011 Petr Muller <pmuller@redhat.com> - 1.4-1
|
||||
- update to new upstream version
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user