RPM Packaging: update tdelibs

pull/3/head
François Andriot 10 years ago
parent 847534b9b0
commit 6ecd003a00

@ -81,7 +81,6 @@ BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: cups-devel BuildRequires: cups-devel
@ -89,7 +88,10 @@ BuildRequires: openssl-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel BuildRequires: libidn-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
# GLIB2 support
BuildRequires: glib2-devel BuildRequires: glib2-devel
# LUA support are not ready yet # LUA support are not ready yet
#BuildRequires: lua-devel #BuildRequires: lua-devel
@ -226,31 +228,33 @@ BuildRequires: OpenEXR-devel
%endif %endif
# LIBTOOL # LIBTOOL
BuildRequires: libtool
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel BuildRequires: %{_lib}ltdl-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libtool-ltdl-devel BuildRequires: libtool-ltdl-devel
%endif %endif
%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140
BuildRequires: libtool
%endif
# X11 support # XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: x11-proto-devel
%if 0%{?mgaversion} >= 4 %if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xcomposite-devel BuildRequires: %{_lib}xcomposite-devel
%else %else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif %endif
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel
%endif %endif
# X11 support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: x11-proto-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: xorg-x11-proto-devel
%endif
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
%endif %endif
@ -547,7 +551,7 @@ fi
-DWITH_ASPELL=ON \ -DWITH_ASPELL=ON \
%{?!with_hspell:-DWITH_HSPELL=OFF} \ %{?!with_hspell:-DWITH_HSPELL=OFF} \
-DWITH_TDEICONLOADER_DEBUG=OFF \ -DWITH_TDEICONLOADER_DEBUG=OFF \
.. .. || cat CMakeFiles/CMakeError.log && exit 1
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

Loading…
Cancel
Save