RPM Packaging: update 3.5.13.2

pull/3/head
François Andriot 11 years ago
parent 301b2ea35e
commit d27e5e6838

@ -8,6 +8,7 @@ grp='./genrpm.sh -v 3.5.13.2 -a'
BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
DIST="$(rpm -E %{dist})" DIST="$(rpm -E %{dist})"
LIB="$(rpm -E %_lib)"
if [ -x /usr/sbin/urpmi ]; then if [ -x /usr/sbin/urpmi ]; then
PKGMGR="urpmi" PKGMGR="urpmi"
@ -92,6 +93,8 @@ grpiud() {
if ! rpm -q libqt3-devel &>/dev/null && ! rpm -q lib64qt3-devel &>/dev/null && ! rpm -q qt3-devel &>/dev/null; then if ! rpm -q libqt3-devel &>/dev/null && ! rpm -q lib64qt3-devel &>/dev/null && ! rpm -q qt3-devel &>/dev/null; then
if [ -r /etc/SuSE-release ]; then if [ -r /etc/SuSE-release ]; then
pushd ../opensuse/core pushd ../opensuse/core
elif [ -r /etc/mandriva-release ]; then
pushd ../mageia
else else
pushd . pushd .
fi fi
@ -100,6 +103,27 @@ if ! rpm -q libqt3-devel &>/dev/null && ! rpm -q lib64qt3-devel &>/dev/null && !
popd popd
fi fi
# Extra dependencies
grpiud extras/akode
if [ "${DIST:0:6}" = ".oss12" ] || [ "${DIST:0:4}" = ".mga" ] || [ "${DIST:0:3}" = ".fc" ]; then
if ! is_installed trinity-hal-devel; then
grpiu 3rdparty/hal
grpiu 3rdparty/hal-info
eval ${PKGINST} trinity-hal-devel || exit 1
fi
fi
if [ "${DIST:0:4}" = ".mga" ]; then
if ! is_installed ${LIB}esound-devel; then
grpiu 3rdparty/esound
eval ${PKGINST} esound-devel || exit 1
fi
if ! is_installed htdig; then
grpiu 3rdparty/htdig
eval ${PKGINST} htdig || exit 1
fi
fi
# TDE dependencies # TDE dependencies
grpiud dependencies/tqtinterface grpiud dependencies/tqtinterface
grpiud dependencies/arts grpiud dependencies/arts
@ -111,8 +135,6 @@ grpiud dependencies/libcarddav
grpiud dependencies/tqca grpiud dependencies/tqca
grpiui dependencies/tqca-tls grpiui dependencies/tqca-tls
# Extra dependencies
grpiud extras/akode
# TDE main # TDE main
# basic packages # basic packages

@ -377,7 +377,7 @@ Requires: %{_lib}jpeg8
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
Requires: libjpeg Requires: libjpeg
%endif %endif
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} == 1220
Requires: libjpeg62 Requires: libjpeg62
%endif %endif
%if 0%{?pclinuxos} %if 0%{?pclinuxos}

@ -1027,6 +1027,7 @@ fi
EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
%endif %endif
# Do NOT remove "%{_includedir}/tqt" from extra-includes !!!
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -1044,7 +1045,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
--enable-closure \ --enable-closure \
--enable-rpath \ --enable-rpath \
\ \
--with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \ --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \
--with-extra-libs=%{tde_libdir} \ --with-extra-libs=%{tde_libdir} \
--with-pythondir=%{_usr} \ --with-pythondir=%{_usr} \
\ \

Loading…
Cancel
Save