- 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:
parent
248853aecd
commit
80a2439218
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
Summary: K Desktop Environment - Libraries
|
Summary: K Desktop Environment - Libraries
|
||||||
Version: 3.5.8
|
Version: 3.5.8
|
||||||
Release: 8%{?dist}
|
Release: 13%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
|
@ -32,6 +32,9 @@ Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
Obsoletes: kdelibs3 = %{version}-%{release}
|
Obsoletes: kdelibs3 = %{version}-%{release}
|
||||||
Provides: 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
|
%endif
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
|
@ -149,7 +152,10 @@ BuildRequires: automake libtool
|
||||||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# For KDE4 crystalsvg-icon-theme is provided by kdeartwork-icons
|
||||||
|
%if "%{name}" == "kdelibs"
|
||||||
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Libraries for the K Desktop Environment:
|
Libraries for the K Desktop Environment:
|
||||||
|
@ -364,27 +370,19 @@ rm -f %{buildroot}%{_libdir}/libkdnssd.la
|
||||||
|
|
||||||
%if "%{name}" != "kdelibs"
|
%if "%{name}" != "kdelibs"
|
||||||
# remove conflicts with kdelibs-4
|
# remove conflicts with kdelibs-4
|
||||||
pushd %{buildroot}%{_bindir}
|
rm -f %{buildroot}%{_bindir}/checkXML
|
||||||
rm -f cupsdconf cupsdoprint imagetops kaddprinterwizard kconf_update kcookiejar \
|
rm -f %{buildroot}%{_bindir}/ksvgtopng
|
||||||
kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
|
rm -f %{buildroot}%{_bindir}/kunittestmodrunner
|
||||||
klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ktradertest \
|
rm -f %{buildroot}%{_datadir}/config/kdebug.areas
|
||||||
make_driver_db_cups make_driver_db_lpr meinproc preparetips \
|
rm -f %{buildroot}%{_datadir}/config/kdebugrc
|
||||||
khotnewstuff kinstalltheme kcmshell kfile kioexec
|
rm -f %{buildroot}%{_datadir}/config/ui/ui_standards.rc
|
||||||
# devel stuff (skip for now)
|
rm -rf %{buildroot}%{_datadir}/doc/HTML/en/common/
|
||||||
#rm -f checkXML kconfig_compiler ksvgtopng kunittestmodrunner makekdewidgets
|
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||||
popd
|
# remove all crsystalsvg icons for now
|
||||||
rm -f %{buildroot}%{_datadir}/config/* \
|
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||||
%{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
|
# These files are not conflicting (yet) but may not be really useful in KDE4
|
||||||
|
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||||
rm -rf %{buildroot}%{_datadir}/config/colors \
|
rm -rf %{buildroot}%{_datadir}/autostart/
|
||||||
%{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
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -450,6 +448,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%{_bindir}/kioslave
|
%{_bindir}/kioslave
|
||||||
%{_bindir}/klauncher
|
%{_bindir}/klauncher
|
||||||
%{_bindir}/kmailservice
|
%{_bindir}/kmailservice
|
||||||
|
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
||||||
%{_bindir}/ksendbugmail
|
%{_bindir}/ksendbugmail
|
||||||
%{_bindir}/kshell
|
%{_bindir}/kshell
|
||||||
%{_bindir}/kstartupconfig
|
%{_bindir}/kstartupconfig
|
||||||
|
@ -474,30 +473,33 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
%exclude %{_datadir}/apps/kdewidgets/
|
%exclude %{_datadir}/apps/kdewidgets/
|
||||||
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
|
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
|
||||||
%config(noreplace) %{_datadir}/config/*
|
%config(noreplace) %{_datadir}/config/*
|
||||||
%{_datadir}/icons/crystalsvg/
|
%{_datadir}/emoticons/*
|
||||||
%{_datadir}/icons/default.kde
|
%{_datadir}/icons/default.kde
|
||||||
%{_datadir}/mimelnk/magic
|
%{_datadir}/mimelnk/magic
|
||||||
%{_datadir}/mimelnk/*/*.desktop
|
%{_datadir}/mimelnk/*/*.desktop
|
||||||
%{_datadir}/services/*
|
%{_datadir}/services/*
|
||||||
%{_datadir}/servicetypes/*
|
%{_datadir}/servicetypes/*
|
||||||
%ghost %{_datadir}/services/ksycoca
|
%ghost %{_datadir}/services/ksycoca
|
||||||
|
%{_docdir}/HTML/en/kspell
|
||||||
%if "%{name}" == "kdelibs"
|
%if "%{name}" == "kdelibs"
|
||||||
%{_sysconfdir}/xdg/menus/*.menu
|
%{_sysconfdir}/xdg/menus/*.menu
|
||||||
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
|
||||||
%{_datadir}/autostart/*
|
%{_datadir}/autostart/*
|
||||||
%{_datadir}/emoticons/*
|
# include also the conflicting file in kdelibs fedora < 9
|
||||||
%{_datadir}/locale/all_languages
|
|
||||||
%{_docdir}/HTML/en/common
|
%{_docdir}/HTML/en/common
|
||||||
%{_docdir}/HTML/en/kspell
|
%{_datadir}/locale/all_languages
|
||||||
|
%{_datadir}/icons/crystalsvg/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
# include also the conflicting file in kdelibs-devel fedora < 9
|
||||||
|
%if "%{name}" == "kdelibs"
|
||||||
%{_bindir}/checkXML
|
%{_bindir}/checkXML
|
||||||
%{_bindir}/dcopidl*
|
|
||||||
%{_bindir}/kconfig_compiler
|
|
||||||
%{_bindir}/ksvgtopng
|
%{_bindir}/ksvgtopng
|
||||||
%{_bindir}/kunittestmodrunner
|
%{_bindir}/kunittestmodrunner
|
||||||
|
%endif
|
||||||
|
%{_bindir}/dcopidl*
|
||||||
|
%{_bindir}/kconfig_compiler
|
||||||
%{_bindir}/makekdewidgets
|
%{_bindir}/makekdewidgets
|
||||||
%{_datadir}/apps/kdewidgets/
|
%{_datadir}/apps/kdewidgets/
|
||||||
%dir %{_libdir}/kde3/plugins/designer
|
%dir %{_libdir}/kde3/plugins/designer
|
||||||
|
@ -517,6 +519,23 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Oct 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-8
|
||||||
- Provides: crystalsvg-icon-theme
|
- Provides: crystalsvg-icon-theme
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue