summaryrefslogtreecommitdiffstats
path: root/redhat/libraries/libksquirrel
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-04 22:47:12 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-04 22:47:12 +0200
commit2bccc67f69c937e4db4e12f77182be57dbbb9a6a (patch)
treeb5e373b52fbb70d9965dd446300766b449cf524d /redhat/libraries/libksquirrel
parent7b26da834f79b8b6eb2d8e99a1467ffea2791380 (diff)
downloadtde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.tar.gz
tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.zip
RPM Packaging: update 3.5.13.2 packages
Diffstat (limited to 'redhat/libraries/libksquirrel')
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index 3dbfa02d8..16c1ca7c4 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -79,7 +79,9 @@ BuildRequires: xmedcon-devel
%define with_svg 1
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2
-BuildRequires: librsvg2-devel
+%endif
+%if 0%{?fedora}
+BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: librsvg
@@ -156,13 +158,20 @@ Tools for KSquirrel.
%patch0 -p1 -b .netpbm
%patch1 -p1 -b .giflib5
+# 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"
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"