8ff9a519 | 2014-10-28 00:41:12 | François Andriot |
RPM Packaging: update R14 packages |
||
M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tdebase/tdebase-14.0.0.spec M redhat/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index a55d14c..7333620 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -108,11 +108,17 @@ %endif %{?uuid_devel:BuildRequires: %{uuid_devel}} -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +# LIBAUDIO support +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_nas 1 -BuildRequires: nas-devel +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define libaudio_devel nas-devel %endif +%if 0%{?suse_version} +%define libaudio_devel libaudio-devel +%endif +%endif +%{?libaudio_devel:BuildRequires: %{libaudio_devel}} # Xrender support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} @@ -364,6 +370,7 @@ %{?x11_devel:Requires: %{x11_devel}} %{?sm_devel:Requires: %{sm_devel}} %{?ice_devel:Requires: %{ice_devel}} +%{?libaudio_devel:Requires: %{libaudio_devel}} %description -n %{libtqt3}-mt-devel TQt is a C++ class library optimized for graphical user interface diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 90a1e5e..ce030c5 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -424,11 +424,6 @@ BuildRequires: Mesa-libGLU-devel %endif -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: nas-devel -%endif - # DBUS support # TQT bindings not available for RHEL4 %if 0%{?rhel} == 4 @@ -485,14 +480,15 @@ # XTST support %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel +%define xtst_devel %{_lib}xtst-devel %else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel +%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel %endif %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXtst-devel +%define xtst_devel libXtst-devel %endif +%{?xtst_devel:BuildRequires: %{xtst_devel}} # XDAMAGE support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -1369,6 +1365,7 @@ Summary: Development files for core binaries for the TDE base module Group: Development/Libraries/Other Requires: %{name}-bin = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} Obsoletes: tdebase-bin-devel < %{version}-%{release} Provides: tdebase-bin-devel = %{version}-%{release} @@ -2257,6 +2254,7 @@ Summary: Development files for tdm Group: Development/Libraries/Other Requires: trinity-tdm = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel %{summary}. @@ -2490,6 +2488,7 @@ Summary: Development files for kicker Group: Development/Libraries/Other Requires: trinity-kicker = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel %{summary}. @@ -3340,6 +3339,7 @@ Summary: Development files for Konqueror's core libraries Group: Development/Libraries/Other Requires: trinity-libkonq = %{version}-%{release} +%{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-libkonq-devel This package contains headers and other development files for the core diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index c6250e8..deed6e9 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -115,11 +115,6 @@ BuildRequires: alsa-lib-devel BuildRequires: cdparanoia -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: nas-devel -%endif - # CDDA support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: libcdda-devel |
||
b108a17f | 2014-10-28 13:15:22 | François Andriot |
RPM Packaging: update tdemultimedia |
||
M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec M redhat/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 7333620..9b3b3b6 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -165,7 +165,7 @@ %endif %{?xft_devel:BuildRequires: %{xft_devel}} -# Xext support +# XEXT support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %define xext_devel libXext-devel %endif diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index ee2ab13..5a0c9f2 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -93,11 +93,6 @@ # ALSA support BuildRequires: alsa-lib-devel -# X11 Libraries -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libXtst-devel -%endif - # XCB support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} BuildRequires: libxcb-devel @@ -107,54 +102,6 @@ BuildRequires: %{_lib}xcb-devel %endif %endif - -# X11 stuff -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}x11-devel -%else -BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libX11-devel -%endif -%if 0%{?rhel} == 4 || 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-devel -%endif - -# XTST support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel -%else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXtst-devel -%endif - -# XI support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -%endif - -# XEXT support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xext-devel -%else -BuildRequires: %{_lib}xext%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXext-devel -%endif - # XAU support %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index deed6e9..1e3f20d 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -163,18 +163,6 @@ BuildRequires: libXxf86vm-devel %endif -# XTST support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel -%else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXtst-devel -%endif - # XINE support %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine} %define with_xine 1 |