- separate include_crystalsvg conditional, set to 1 until we have
kdeartwork 4
- don't run icon %%post/%%postun snippets for crystalsvg if we don't ship
it
- add "3" in all summaries and descriptions
This commit is contained in:
Kevin Kofler
parent
474b85ce19
commit
61054c623d
|
|
@ -19,22 +19,28 @@
|
|||
|
||||
%define apidocs 1
|
||||
|
||||
Summary: K Desktop Environment - Libraries
|
||||
Summary: K Desktop Environment 3 - Libraries
|
||||
Version: 3.5.8
|
||||
Release: 14%{?dist}
|
||||
Release: 15%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs3
|
||||
Obsoletes: kdelibs < 6:%{version}-%{release}
|
||||
Provides: kdelibs = 6:%{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
|
||||
# TODO: set to 0 (F9+) once we have kdeartwork 4
|
||||
%define include_crystalsvg 1
|
||||
%else
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
Obsoletes: kdelibs3 = %{version}-%{release}
|
||||
Provides: kdelibs3 = %{version}-%{release}
|
||||
%define include_crystalsvg 1
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg} == 0
|
||||
# FIXME/TODO: KDE3 apps still need the crystalsvg-icon-theme
|
||||
# This is provided by kdeartwork-icons >= 3.96.0-2
|
||||
Requires: crystalsvg-icon-theme
|
||||
%endif
|
||||
|
||||
License: LGPLv2
|
||||
|
|
@ -153,12 +159,12 @@ Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
|||
%endif
|
||||
|
||||
# For KDE4 crystalsvg-icon-theme is provided by kdeartwork-icons
|
||||
%if "%{name}" == "kdelibs"
|
||||
%if 0%{?include_crystalsvg}
|
||||
Provides: crystalsvg-icon-theme = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description
|
||||
Libraries for the K Desktop Environment:
|
||||
Libraries for the K Desktop Environment 3:
|
||||
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
|
||||
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
|
||||
kspell (spelling checker), jscript (javascript), kab (addressbook),
|
||||
|
|
@ -166,7 +172,7 @@ kimgio (image manipulation).
|
|||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Header files and documentation for compiling KDE applications.
|
||||
Summary: Header files and documentation for compiling KDE 3 applications.
|
||||
%if "%{name}" == "kdelibs"
|
||||
Obsoletes: kdelibs3-devel < %{version}-%{release}
|
||||
Provides: kdelibs3-devel = %{version}-%{release}
|
||||
|
|
@ -194,11 +200,11 @@ Requires: zlib-devel
|
|||
%endif
|
||||
%description devel
|
||||
This package includes the header files you will need to compile
|
||||
applications for KDE.
|
||||
applications for KDE 3.
|
||||
|
||||
%package apidocs
|
||||
Group: Development/Documentation
|
||||
Summary: KDE API documentation.
|
||||
Summary: KDE 3 API documentation.
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
%if "%{name}" == "kdelibs"
|
||||
Provides: kdelibs3-apidocs = %{version}-%{release}
|
||||
|
|
@ -208,7 +214,7 @@ Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
|||
%endif
|
||||
|
||||
%description apidocs
|
||||
This package includes the KDE API documentation in HTML
|
||||
This package includes the KDE 3 API documentation in HTML
|
||||
format for easy browsing
|
||||
|
||||
|
||||
|
|
@ -378,13 +384,16 @@ 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
|
||||
|
||||
%if 0%{?include_crystalsvg} == 0
|
||||
# remove all crystalsvg icons for now
|
||||
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
|
@ -392,14 +401,18 @@ rm -rf %{buildroot}
|
|||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%if 0%{?include_crystalsvg}
|
||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%endif
|
||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%if 0%{?include_crystalsvg}
|
||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%endif
|
||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||
|
||||
|
||||
|
|
@ -487,6 +500,8 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||
# include also the conflicting file in kdelibs fedora < 9
|
||||
%{_docdir}/HTML/en/common
|
||||
%{_datadir}/locale/all_languages
|
||||
%endif
|
||||
%if 0%{?include_crystalsvg}
|
||||
%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
|
|
@ -519,6 +534,11 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-15
|
||||
- separate include_crystalsvg conditional, set to 1 until we have kdeartwork 4
|
||||
- don't run icon %%post/%%postun snippets for crystalsvg if we don't ship it
|
||||
- add "3" in all summaries and descriptions
|
||||
|
||||
* Sat Dec 01 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.8-14
|
||||
- fix inverted logic for Requires: crystalsvg-icon-theme
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue