Merge branch 'f17'

Conflicts:
	kdelibs.spec
This commit is contained in:
Rex Dieter 2012-02-28 12:52:40 -06:00
commit 1303dad95f
1 changed files with 4 additions and 1 deletions

View File

@ -20,7 +20,7 @@
Summary: KDE Libraries
Version: 4.8.0
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -580,6 +580,9 @@ rm -rf %{buildroot}
%changelog
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6:4.8.0-5
- Rebuilt for c++ ABI breakage
* Sat Feb 18 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-4
- don't set rpath on multiarch dirs (kde review request #103422)