summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec10
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec2
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec1
4 files changed, 10 insertions, 5 deletions
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 96513bfed..59a9086d4 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -81,7 +81,7 @@ BuildRequires: libvorbis-devel
BuildRequires: esound-devel
# JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} [[ 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
%define with_jack 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%define jack_devel %{_lib}jack-devel
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 58400a76d..0849488e1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package avahi-tqt
+# spec file for package avahi-tqt (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -16,6 +16,7 @@
#
# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -26,7 +27,7 @@
Name: trinity-avahi-tqt
-Epoch: 2
+Epoch: %{tde_epoch}
Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Avahi TQt integration library
@@ -47,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: libtqt4-devel >= 2:4.2.0
+BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -64,6 +65,9 @@ BuildRequires: dbus-1-devel
BuildRequires: dbus-devel
%endif
+# PCAP support
+BuildRequires: libcap-devel
+
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
%define avahi_devel %{_lib}avahi-client-devel
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 5dde03ebf..e20b0c3b1 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -168,7 +168,7 @@ fi
-DLIB_INSTALL_DIR=%{_libdir} \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 6c5363345..164552d13 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -20,6 +20,7 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
%define tde_pkg tqtinterface
%define tde_prefix /opt/trinity