Merge branch 'f15'

Conflicts:
	orc.spec

Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>
This commit is contained in:
Fabian Deutsch 2011-04-15 10:47:18 +02:00
commit d2ea7bfa55

View File

@ -78,7 +78,7 @@ rm -rf %{buildroot}
%check %check
%ifnarch s390 s390x %ifnarch s390 s390x ppc ppc64
make check make check
%endif %endif
@ -117,6 +117,9 @@ make check
* Fri Apr 15 2011 Fabian Deutsch <fabiand@fedorpaproject.org> - 0.4.12-1 * Fri Apr 15 2011 Fabian Deutsch <fabiand@fedorpaproject.org> - 0.4.12-1
- Update to 0.4.12, a bug fixing release - Update to 0.4.12, a bug fixing release
* Wed Feb 23 2011 Karsten Hopp <karsten@redhat.com> 0.4.11-3
- don't run tests on ppc, ppc64
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.11-2 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild