- don't hardcode %%fedora

Wed Nov 21 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-12
- renew the list of file conflicts and removals
Tue Nov 20 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-11
- preserve makekdewidgets and kconf_compiler for fedora > 9
- add Requires: crystalsvg-icon-theme (for kdelibs3)
Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-10
- only include and provide crystalsvg-icon-theme for fedora < 9
Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-9
- add switch to force rpmbuild behavior for testing
- prepare %%files for non-conflicting kdelibs3
This commit is contained in:
Kevin Kofler 2007-12-01 19:18:27 +00:00
parent 248853aecd
commit 80a2439218
1 changed files with 48 additions and 29 deletions

View File

@ -21,7 +21,7 @@
Summary: K Desktop Environment - Libraries
Version: 3.5.8
Release: 8%{?dist}
Release: 13%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs3
@ -32,6 +32,9 @@ Name: kdelibs
Epoch: 6
Obsoletes: kdelibs3 = %{version}-%{release}
Provides: kdelibs3 = %{version}-%{release}
# FIXME/TODO: KDE3 apps needs still the crystalsvg-icon-theme
# This is provided by kdeartwork-icons >= 3.96.0-2
Requires: crystalsvg-icon-theme
%endif
License: LGPLv2
@ -149,7 +152,10 @@ BuildRequires: automake libtool
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
%endif
# For KDE4 crystalsvg-icon-theme is provided by kdeartwork-icons
%if "%{name}" == "kdelibs"
Provides: crystalsvg-icon-theme = %{version}-%{release}
%endif
%description
Libraries for the K Desktop Environment:
@ -364,27 +370,19 @@ rm -f %{buildroot}%{_libdir}/libkdnssd.la
%if "%{name}" != "kdelibs"
# remove conflicts with kdelibs-4
pushd %{buildroot}%{_bindir}
rm -f cupsdconf cupsdoprint imagetops kaddprinterwizard kconf_update kcookiejar \
kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ktradertest \
make_driver_db_cups make_driver_db_lpr meinproc preparetips \
khotnewstuff kinstalltheme kcmshell kfile kioexec
# devel stuff (skip for now)
#rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
popd
rm -f %{buildroot}%{_datadir}/config/* \
%{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
rm -rf %{buildroot}%{_datadir}/config/colors \
%{buildroot}%{_datadir}/apps/k* \
%{buildroot}%{_datadir}/apps/LICENSES \
%{buildroot}%{_datadir}/apps/proxyscout \
%{buildroot}%{_datadir}/locale \
%{buildroot}%{_datadir}/autostart \
%{buildroot}/etc/xdg \
%{buildroot}%{_docdir}/HTML \
%{buildroot}%{_datadir}/emoticons
rm -f %{buildroot}%{_bindir}/checkXML
rm -f %{buildroot}%{_bindir}/ksvgtopng
rm -f %{buildroot}%{_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_datadir}/config/kdebug.areas
rm -f %{buildroot}%{_datadir}/config/kdebugrc
rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
rm -rf %{buildroot}%{_datadir}/doc/HTML/en/common/
rm -rf %{buildroot}%{_datadir}/locale/all_languages
# remove all crsystalsvg icons for now
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
# These files are not conflicting (yet) but may not be really useful in KDE4
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
rm -rf %{buildroot}%{_datadir}/autostart/
%endif
@ -450,6 +448,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%{_bindir}/kioslave
%{_bindir}/klauncher
%{_bindir}/kmailservice
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%{_bindir}/ksendbugmail
%{_bindir}/kshell
%{_bindir}/kstartupconfig
@ -474,30 +473,33 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%exclude %{_datadir}/apps/kdewidgets/
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
%config(noreplace) %{_datadir}/config/*
%{_datadir}/icons/crystalsvg/
%{_datadir}/emoticons/*
%{_datadir}/icons/default.kde
%{_datadir}/mimelnk/magic
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%ghost %{_datadir}/services/ksycoca
%{_docdir}/HTML/en/kspell
%if "%{name}" == "kdelibs"
%{_sysconfdir}/xdg/menus/*.menu
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%{_datadir}/autostart/*
%{_datadir}/emoticons/*
%{_datadir}/locale/all_languages
# include also the conflicting file in kdelibs fedora < 9
%{_docdir}/HTML/en/common
%{_docdir}/HTML/en/kspell
%{_datadir}/locale/all_languages
%{_datadir}/icons/crystalsvg/
%endif
%files devel
%defattr(-,root,root,-)
# include also the conflicting file in kdelibs-devel fedora < 9
%if "%{name}" == "kdelibs"
%{_bindir}/checkXML
%{_bindir}/dcopidl*
%{_bindir}/kconfig_compiler
%{_bindir}/ksvgtopng
%{_bindir}/kunittestmodrunner
%endif
%{_bindir}/dcopidl*
%{_bindir}/kconfig_compiler
%{_bindir}/makekdewidgets
%{_datadir}/apps/kdewidgets/
%dir %{_libdir}/kde3/plugins/designer
@ -517,6 +519,23 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-13
- don't hardcode %%fedora
* Wed Nov 21 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-12
- renew the list of file conflicts and removals
* Tue Nov 20 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-11
- preserve makekdewidgets and kconf_compiler for fedora > 9
- add Requires: crystalsvg-icon-theme (for kdelibs3)
* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-10
- only include and provide crystalsvg-icon-theme for fedora < 9
* Sun Nov 18 2007 Sebastian Vahl <fedora@deadbabylon.de> 3.5.8-9
- add switch to force rpmbuild behavior for testing
- prepare %%files for non-conflicting kdelibs3
* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-8
- Provides: crystalsvg-icon-theme