Remove obsolete conditionals
This commit is contained in:
parent
453f143613
commit
6956032596
|
@ -8,8 +8,6 @@
|
|||
%define distname "EL"
|
||||
%endif
|
||||
|
||||
%define kde_settings 1
|
||||
|
||||
%define arts_ev 8:1.5.10
|
||||
%define qt3 qt3
|
||||
%define qt3_version 3.3.8b
|
||||
|
@ -20,11 +18,6 @@
|
|||
|
||||
%define apidocs 0
|
||||
|
||||
# We always include this here now because kdeartwork 4 has moved on to
|
||||
# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
|
||||
# yet either). Maybe the conditional should be dropped entirely? -- Kevin
|
||||
%define include_crystalsvg 1
|
||||
|
||||
Summary: KDE 3 Libraries
|
||||
Name: kdelibs3
|
||||
Version: 3.5.10
|
||||
|
@ -113,9 +106,7 @@ Patch207: libltdl-CVE-2009-3736.patch
|
|||
Patch208: kdelibs-3.5.x-CVE-2011-3365.patch
|
||||
|
||||
Requires: hicolor-icon-theme
|
||||
%if %{kde_settings}
|
||||
Requires: kde-settings >= 3.5
|
||||
%endif
|
||||
Requires: kde-filesystem
|
||||
Requires: kdelibs-common
|
||||
Requires: redhat-menus
|
||||
|
@ -178,13 +169,8 @@ BuildRequires: automake libtool
|
|||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg}
|
||||
Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
|
||||
Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
|
||||
%else
|
||||
# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
|
||||
Requires: crystalsvg-icon-theme
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
|
@ -452,11 +438,6 @@ rm -fv %{buildroot}%{_datadir}/config/katesyntaxhighlightingrc
|
|||
# don't show kresources
|
||||
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||
|
||||
%if 0%{?include_crystalsvg} == 0
|
||||
# remove all crystalsvg icons for now
|
||||
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
|
||||
%check
|
||||
ERROR=0
|
||||
|
@ -475,18 +456,14 @@ 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 || :
|
||||
|
||||
|
||||
|
@ -568,9 +545,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||
%ghost %{_datadir}/services/ksycoca
|
||||
%{_docdir}/HTML/en/kspell
|
||||
%{_docdir}/HTML/en/common/*
|
||||
%if 0%{?include_crystalsvg}
|
||||
%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
|
|
Loading…
Reference in New Issue