diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 391890e3e..0279140ae 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -322,6 +322,7 @@ Requires: opensuse-manuals_en %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html %endif +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: cmake >= 2.8 @@ -459,6 +460,19 @@ BuildRequires: xscreensaver BuildRequires: libavahi-tqt-devel %endif +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: mesaglu-devel +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel +%endif + # NAS support # (what is nas btw ?) %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -481,20 +495,6 @@ Requires: libdbus-tqt-1-0 >= 2:0.63 BuildRequires: perl-Digest-MD5 %endif -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -%define with_jack 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jack-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: jack-audio-connection-kit-devel -%endif -%if 0%{?suse_version} -BuildRequires: libjack-devel -%endif -%endif - # LIBART_LGPL support %define with_libart 1 BuildRequires: libart_lgpl-devel @@ -569,10 +569,10 @@ BuildRequires: libXcomposite-devel BuildRequires: xorg-x11-devel %endif +# LIBFONTENC support %if 0%{?suse_version} == 1140 BuildRequires: xorg-x11-libfontenc-devel %endif - %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 BuildRequires: libfontenc-devel %endif diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 6109da527..d34d9ff3e 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -490,15 +490,27 @@ Summary: TDE Libraries (Development files) Group: Development/Libraries/X11 Requires: %{name} = %{version}-%{release} -Requires: libtqt3-mt-devel >= 3.5.0 -Requires: libtqt4-devel = 2:4.2.0 -Requires: trinity-arts-devel >= 2:1.5.10 - Obsoletes: tdelibs-devel < %{version}-%{release} Provides: tdelibs-devel = %{version}-%{release} Obsoletes: trinity-kdelibs-devel < %{version}-%{release} Provides: trinity-kdelibs-devel = %{version}-%{release} +Requires: libtqt3-mt-devel >= 3.5.0 +Requires: libtqt4-devel = 2:4.2.0 +Requires: trinity-arts-devel >= 2:1.5.10 + +# XCOMPOSITE support +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} >= 4 +Requires: %{_lib}xcomposite-devel +%else +Requires: %{_lib}xcomposite%{?mgaversion:1}-devel +%endif +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 +Requires: libXcomposite-devel +%endif + %description devel This package includes the header files you will need to compile applications for TDE.