diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-02 23:02:07 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-02 23:02:07 +0200 |
| commit | 6ecd003a00d771473f8e18cc3da5ddfb9fe5207c (patch) | |
| tree | 68bc9f6e433f1a556142378d118330da7f545d7a | |
| parent | 847534b9b0fadec28cb3045b06740fc59e0b06f4 (diff) | |
| download | tde-packaging-6ecd003a00d771473f8e18cc3da5ddfb9fe5207c.tar.gz tde-packaging-6ecd003a00d771473f8e18cc3da5ddfb9fe5207c.zip | |
RPM Packaging: update tdelibs
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 21734a9d1..38cec7ea7 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -81,7 +81,6 @@ BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: libtool BuildRequires: krb5-devel BuildRequires: libxslt-devel BuildRequires: cups-devel @@ -89,7 +88,10 @@ BuildRequires: openssl-devel BuildRequires: alsa-lib-devel BuildRequires: libidn-devel BuildRequires: libtiff-devel + +# GLIB2 support BuildRequires: glib2-devel + # LUA support are not ready yet #BuildRequires: lua-devel @@ -226,31 +228,33 @@ BuildRequires: OpenEXR-devel %endif # LIBTOOL +BuildRequires: libtool %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 BuildRequires: libtool-ltdl-devel %endif -%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140 -BuildRequires: libtool -%endif -# X11 support +# XCOMPOSITE support %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: x11-proto-devel %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xcomposite-devel %else BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel %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 BuildRequires: libXcomposite-devel %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 BuildRequires: xorg-x11-devel %endif @@ -547,7 +551,7 @@ fi -DWITH_ASPELL=ON \ %{?!with_hspell:-DWITH_HSPELL=OFF} \ -DWITH_TDEICONLOADER_DEBUG=OFF \ - .. + .. || cat CMakeFiles/CMakeError.log && exit 1 %__make %{?_smp_mflags} || %__make |