|
|
@@ -24,8 +24,8 @@
|
|
|
##
|
|
|
|
|
|
# package version
|
|
|
-%define V_kde 3.1.4
|
|
|
-%define V_base 3.1.4
|
|
|
+%define V_kde 3.2.3
|
|
|
+%define V_base 3.2.3
|
|
|
|
|
|
# package information
|
|
|
Name: kde-base
|
|
|
@@ -38,7 +38,7 @@ Class: EVAL
|
|
|
Group: KDE
|
|
|
License: GPL
|
|
|
Version: %{V_base}
|
|
|
-Release: 20040207
|
|
|
+Release: 20040806
|
|
|
|
|
|
# list of sources
|
|
|
Source0: ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
|
|
|
@@ -119,6 +119,7 @@ AutoReqProv: no
|
|
|
export MOC="%{l_prefix}/libexec/kde/moc"
|
|
|
export UIC_PATH="%{l_prefix}/libexec/kde/uic"
|
|
|
export HOME="`pwd`"
|
|
|
+ export KDECONFIG="%{l_prefix}/libexec/kde/kde-config"
|
|
|
|
|
|
# set KDE/Qt installation paths
|
|
|
export KDEDIR="%{l_prefix}"
|
|
|
@@ -166,6 +167,46 @@ AutoReqProv: no
|
|
|
--disable-static \
|
|
|
--enable-shared
|
|
|
|
|
|
+ # prevent linking of static libraries to early in the build process
|
|
|
+ %{l_shtool} subst \
|
|
|
+ -e 's;\-lXrender;;g' \
|
|
|
+ -e 's;\-lexpat;;g' \
|
|
|
+ -e 's;\-lfreetype;;g' \
|
|
|
+ -e 's;\-lfontconfig;;g' \
|
|
|
+ kate/interfaces/Makefile \
|
|
|
+ kcontrol/background/Makefile \
|
|
|
+ kcontrol/filetypes/Makefile \
|
|
|
+ kcontrol/input/Makefile \
|
|
|
+ kcontrol/style/Makefile \
|
|
|
+ kcontrol/kcontrol/Makefile \
|
|
|
+ kcontrol/colors/Makefile \
|
|
|
+ kcontrol/fonts/Makefile \
|
|
|
+ kcontrol/kfontinst/lib/Makefile \
|
|
|
+ kfind/Makefile \
|
|
|
+ khotkeys/kcontrol/ui/Makefile \
|
|
|
+ khotkeys/shared/Makefile \
|
|
|
+ kicker/share/Makefile \
|
|
|
+ kicker/core/Makefile \
|
|
|
+ kicker/buttons/Makefile \
|
|
|
+ kicker/ui/Makefile \
|
|
|
+ klipper/Makefile \
|
|
|
+ ksplashml/themeengine/default/Makefile \
|
|
|
+ ksplashml/themeengine/redmond/Makefile \
|
|
|
+ ksplashml/themeengine/standard/Makefile \
|
|
|
+ ksysguard/gui/SensorDisplayLib/Makefile \
|
|
|
+ libkonq/Makefile
|
|
|
+
|
|
|
+ # if linked with static libraries, order is important
|
|
|
+ %{l_shtool} subst \
|
|
|
+ -e '/^kfontinst_LDADD = /s;\(\$(LIBFONTCONFIG_LIBS) \$(LIBFREETYPE_LIBS)\) \(\$(LIB_KDECORE) \.\./lib/libkfontinst.la\);\2 \1;' \
|
|
|
+ kcontrol/kfontinst/kfontinst/Makefile
|
|
|
+
|
|
|
+ # add directives for pcre where needed
|
|
|
+ %{l_shtool} subst \
|
|
|
+ -e '/LIBS = /s;\(\-lqt-mt\);\-lpcreposix \-lpcre \1;g' \
|
|
|
+ khelpcenter/Makefile \
|
|
|
+ kdesktop/kwebdesktop/Makefile
|
|
|
+
|
|
|
# build package
|
|
|
%{l_make} %{l_mflags -O}
|
|
|
|