Merge branch 'master' into f17

Conflicts:
	kdelibs3.spec
This commit is contained in:
Than Ngo 2012-04-04 19:07:04 +02:00
commit c4e68e89c4

View File

@ -18,7 +18,7 @@
%define kde_major_version 3
%define apidocs 1
%define apidocs 0
# We always include this here now because kdeartwork 4 has moved on to
# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
@ -28,7 +28,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
Release: 34%{?dist}
Release: 35%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@ -589,8 +589,11 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-34
- Rebuilt for c++ ABI breakage
* Wed Apr 04 2012 Than Ngo <than@redhat.com> - 3.5.10-35
- drop apidocs
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 3.5.10-34
- Rebuild against PCRE 8.30
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild