- change the use of anonymous namespace in kedittoolbar.h, so that
the KEditToolbar classes are exported again plus change the way kdnssd files are removed from packaging to rm -(r)f in install, instead of %exclude, which doesn't quite work as expected
This commit is contained in:
parent
7b285bcf89
commit
2d68e1297c
@ -46,6 +46,7 @@ Patch34: kdelibs-3.4.0-qtdoc.patch
|
||||
Patch35: kdelibs-3.4.92-inttype.patch
|
||||
Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
|
||||
Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
|
||||
Patch39: kdelibs-3.5.3-gcc-4.1.1-8.patch
|
||||
|
||||
# upstream patches
|
||||
Patch100: kdelibs-3.5.3-konqueror-khtml.patch
|
||||
@ -189,6 +190,7 @@ format for easy browsing
|
||||
%patch35 -p1 -b .inttype
|
||||
%patch37 -p1 -b .kdebug-kmail-quiet
|
||||
%patch38 -p1 -b .cupsdconf2-group
|
||||
%patch39 -p1 -b .gcc-4.1.1-8
|
||||
|
||||
# upstream patches
|
||||
%patch100 -p1 -b .konqueror-khtml
|
||||
@ -300,6 +302,9 @@ popd
|
||||
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||
rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/libkdnssd.*
|
||||
rm -rf %{buildroot}%{_includedir}/kde/dnssd
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
@ -421,8 +426,6 @@ fi
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/lib*.a
|
||||
%exclude %{_libdir}/libkdeinit_*
|
||||
%exclude %{_libdir}/libkdnssd.*
|
||||
%exclude %{_includedir}/kde/dnssd/
|
||||
|
||||
%files apidocs
|
||||
%defattr(-,root,root)
|
||||
@ -433,6 +436,8 @@ fi
|
||||
* Tue Jul 18 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.3-10
|
||||
- do not ship the dummy kdnssd implementation, depend on external one
|
||||
(there is one provided by kdnssd-avahi now)
|
||||
- change the use of anonymous namespace in kedittoolbar.h, so that
|
||||
the KEditToolbar classes are exported again
|
||||
|
||||
* Mon Jul 17 2006 Petr Rockai <prockai@redhat.com>
|
||||
- should have been 6:3.5.3-9 but accidentally built as 6:3.5.3-8.fc6
|
||||
|
Loading…
Reference in New Issue
Block a user