rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- change the use of anonymous namespace in kedittoolbar.h, so that

Browse Source 
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:
prockai 2006-07-18 20:34:59 +00:00
parent 7b285bcf89
commit 2d68e1297c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kdelibs.spec
View File

@ -46,6 +46,7 @@ Patch34: kdelibs-3.4.0-qtdoc.patch
Patch35: kdelibs-3.4.92-inttype.patch Patch35: kdelibs-3.4.92-inttype.patch
Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
Patch38: kdelibs-3.5.2-cupsdconf2-group.patch Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
Patch39: kdelibs-3.5.3-gcc-4.1.1-8.patch
# upstream patches # upstream patches
Patch100: kdelibs-3.5.3-konqueror-khtml.patch Patch100: kdelibs-3.5.3-konqueror-khtml.patch
@ -189,6 +190,7 @@ format for easy browsing
%patch35 -p1 -b .inttype %patch35 -p1 -b .inttype
%patch37 -p1 -b .kdebug-kmail-quiet %patch37 -p1 -b .kdebug-kmail-quiet
%patch38 -p1 -b .cupsdconf2-group %patch38 -p1 -b .cupsdconf2-group
%patch39 -p1 -b .gcc-4.1.1-8
# upstream patches # upstream patches
%patch100 -p1 -b .konqueror-khtml %patch100 -p1 -b .konqueror-khtml
@ -300,6 +302,9 @@ popd
echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme rm -f %{buildroot}%{_datadir}/icons/hicolor/index.theme
rm -f %{buildroot}%{_libdir}/libkdnssd.*
rm -rf %{buildroot}%{_includedir}/kde/dnssd
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -421,8 +426,6 @@ fi
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/lib*.a %{_libdir}/lib*.a
%exclude %{_libdir}/libkdeinit_* %exclude %{_libdir}/libkdeinit_*
%exclude %{_libdir}/libkdnssd.*
%exclude %{_includedir}/kde/dnssd/
%files apidocs %files apidocs
%defattr(-,root,root) %defattr(-,root,root)
@ -433,6 +436,8 @@ fi
* Tue Jul 18 2006 Petr Rockai <prockai@redhat.com> - 6:3.5.3-10 * 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 - do not ship the dummy kdnssd implementation, depend on external one
(there is one provided by kdnssd-avahi now) (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> * 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 - should have been 6:3.5.3-9 but accidentally built as 6:3.5.3-8.fc6