summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-05 19:05:50 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-05 19:05:50 +0200
commit0a5934b1b2ad08d0d728d081e779f56d303243ed (patch)
tree0266e89c968af277bb9098185f7a398c7e75f029
parentdee649254a7acd6603c905d43744b499ac875b6e (diff)
downloadtde-packaging-0a5934b1b2ad08d0d728d081e779f56d303243ed.tar.gz
tde-packaging-0a5934b1b2ad08d0d728d081e779f56d303243ed.zip
RPM Packaging: update tdebase
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec17
1 files changed, 14 insertions, 3 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 6f444a8c6..85541a970 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -101,6 +101,10 @@ Provides: trinity-kdebase-extras = %{version}-%{release}
Obsoletes: tdebase < %{version}-%{release}
Provides: tdebase = %{version}-%{release}
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
### Distribution-specific settings ###
@@ -454,8 +458,9 @@ BuildRequires: nas-devel
BuildRequires: dbus-devel >= 0.22-12.EL.9p1
Requires: dbus-qt >= 0.22-12.EL.9p1
%else
-BuildRequires: libdbus-tqt-devel >= 2:0.63
-Requires: libdbus-tqt >= 2:0.63
+BuildRequires: libdbus-tqt-1-devel >= 2:0.63
+BuildRequires: libdbus-1-tqt-devel >= 2:0.9
+Requires: libdbus-tqt-1-0 >= 2:0.63
%endif
%if 0%{?fedora} >= 17
@@ -463,12 +468,18 @@ 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%{?fedora} || 0%{?rhel} >= 5
+%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