* Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
- bump min deps (cmake, kde-filesystem, phonon) - kde.(sh|csh): cleanup QT_PLUGIN_PATH handling - Requires: coreutils grep
This commit is contained in:
parent
6ee5e7bc0d
commit
a5e92a9072
13
kde4.csh
13
kde4.csh
|
@ -10,9 +10,16 @@ if ( -f /etc/sysconfig/prelink ) then
|
||||||
if ( "$PRELINKING" == "yes" ) then
|
if ( "$PRELINKING" == "yes" ) then
|
||||||
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
|
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
|
||||||
endif
|
endif
|
||||||
|
unset PRELINKING
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ( ! $?QT_PLUGIN_PATH ) then
|
# handled in startkde, but this sets for other DE's too
|
||||||
set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
|
set KDE4_QTPLUGINS=`kde4-config --path qtplugins`
|
||||||
setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
|
if ( $?QT_PLUGIN_PATH ) then
|
||||||
|
if ( "$QT_PLUGIN_PATH" !~ *"${KDE4_QTPLUGINS}"* ) then
|
||||||
|
setenv QT_PLUGIN_PATH ${QT_PLUGIN_PATH}:${KDE4_QTPLUGINS}
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
setenv QT_PLUGIN_PATH ${KDE4_QTPLUGINS}
|
||||||
endif
|
endif
|
||||||
|
unset KDE4_QTPLUGINS
|
||||||
|
|
12
kde4.sh
12
kde4.sh
|
@ -11,7 +11,13 @@ if [ -f /etc/sysconfig/prelink ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$QT_PLUGIN_PATH" ]; then
|
# handled in startkde, but this sets for other DE's too
|
||||||
KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
|
if [ -n "$QT_PLUGIN_PATH" ] ; then
|
||||||
QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
|
if ! echo "$QT_PLUGIN_PATH" | grep -qw `kde4-config --path qtplugins` ; then
|
||||||
|
QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
|
||||||
fi
|
fi
|
||||||
|
export QT_PLUGIN_PATH
|
||||||
|
|
||||||
|
|
22
kdelibs.spec
22
kdelibs.spec
|
@ -27,10 +27,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRequires: kde4-macros(api) >= 2
|
BuildRequires: kde4-macros(api) >= 2
|
||||||
BuildRequires: kde-filesystem >= 4
|
BuildRequires: kde-filesystem >= 4-23
|
||||||
|
# used in kde.(sh|csh)
|
||||||
|
Requires: coreutils grep
|
||||||
|
# dbus-launch needed here? don't think so, but be safe and keep
|
||||||
|
# for now -- Rex
|
||||||
Requires: dbus-x11
|
Requires: dbus-x11
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
Requires: kde-filesystem >= 4
|
Requires: kde-filesystem >= 4-23
|
||||||
Requires: kde-settings
|
Requires: kde-settings
|
||||||
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
||||||
Requires: shared-mime-info
|
Requires: shared-mime-info
|
||||||
|
@ -40,6 +44,7 @@ Requires: kdelibs-common
|
||||||
%if 0%{?fedora} >= 9
|
%if 0%{?fedora} >= 9
|
||||||
Requires: hunspell
|
Requires: hunspell
|
||||||
%endif
|
%endif
|
||||||
|
Requires: phonon >= 4.2.96
|
||||||
Requires: soprano >= 2.1.64
|
Requires: soprano >= 2.1.64
|
||||||
|
|
||||||
Source1: kde4.sh
|
Source1: kde4.sh
|
||||||
|
@ -89,7 +94,7 @@ BuildRequires: aspell-devel
|
||||||
BuildRequires: automoc
|
BuildRequires: automoc
|
||||||
BuildRequires: avahi-devel
|
BuildRequires: avahi-devel
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: cmake >= 2.6.2
|
BuildRequires: cmake >= 2.6.2-3
|
||||||
BuildRequires: cups-devel cups
|
BuildRequires: cups-devel cups
|
||||||
BuildRequires: enchant-devel
|
BuildRequires: enchant-devel
|
||||||
BuildRequires: gamin-devel
|
BuildRequires: gamin-devel
|
||||||
|
@ -107,7 +112,7 @@ BuildRequires: libxslt-devel libxml2-devel
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: phonon-devel >= 4.2
|
BuildRequires: phonon-devel >= 4.2.96
|
||||||
BuildRequires: shared-mime-info
|
BuildRequires: shared-mime-info
|
||||||
BuildRequires: soprano-devel >= 2.1.64
|
BuildRequires: soprano-devel >= 2.1.64
|
||||||
BuildRequires: strigi-devel >= 0.5.9
|
BuildRequires: strigi-devel >= 0.5.9
|
||||||
|
@ -145,11 +150,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||||
Provides: kdelibs4-devel = %{version}-%{release}
|
Provides: kdelibs4-devel = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
Requires: cmake >= 2.6.2
|
Requires: cmake >= 2.6.2-3
|
||||||
Requires: automoc
|
Requires: automoc
|
||||||
Requires: qt4-devel
|
Requires: qt4-devel
|
||||||
Requires: openssl-devel
|
Requires: openssl-devel
|
||||||
Requires: phonon-devel >= 4.2
|
Requires: phonon-devel >= 4.2.96
|
||||||
Requires: strigi-devel
|
Requires: strigi-devel
|
||||||
Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
|
Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
|
||||||
%{?x_deps:Requires: %{x_deps}}
|
%{?x_deps:Requires: %{x_deps}}
|
||||||
|
@ -360,6 +365,11 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.1.96-4
|
||||||
|
- bump min deps (cmake, kde-filesystem, phonon)
|
||||||
|
- kde.(sh|csh): cleanup QT_PLUGIN_PATH handling
|
||||||
|
- Requires: coreutils grep
|
||||||
|
|
||||||
* Fri Jan 09 2009 Than Ngo <than@redhat.com> - 4.1.96-3
|
* Fri Jan 09 2009 Than Ngo <than@redhat.com> - 4.1.96-3
|
||||||
- BR soprano >= 2.1.64
|
- BR soprano >= 2.1.64
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue