Merge branch 'f17' into f16

2012-07-13 07:30:19 -05:00 · 2012-07-13 07:30:19 -05:00 · af4915e1d2
parent 890085c09a c95acea448
commit af4915e1d2
1 changed files with 1 additions and 0 deletions
--- a/kdelibs.spec
+++ b/kdelibs.spec
@ -365,6 +365,7 @@ popd
 %patch52 -p1 -b .SOLID_UPNP
 %patch53 -p1 -b .kjs-s390
 %patch54 -p1 -b .kjs-locale
+%patch55 -p1 -b .solid_cd_eject

 # upstream patches
 %patch100 -p1 -b .kdeclarative-install-location