diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:00:13 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:00:13 +0100 |
| commit | a221ed54aa985c004d35de3c9f47f575dcaafaba (patch) | |
| tree | 15114e61b2c45512cf5903c2e0a498202e722c91 /redhat/libraries/libksquirrel | |
| parent | a0837c0ccd4281fe21a97f284c8c06c1990d5f5e (diff) | |
| download | tde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.tar.gz tde-packaging-a221ed54aa985c004d35de3c9f47f575dcaafaba.zip | |
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/libraries/libksquirrel')
| -rw-r--r-- | redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index 38f443f7b..b3f329402 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -156,6 +156,12 @@ Tools for KSquirrel. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch0 -p1 -b .netpbm +# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype' +if [ -r /usr/include/freetype2/ftbitmap.h ]; then + %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|" + %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|" +fi + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -164,7 +170,6 @@ Tools for KSquirrel. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ |