summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-07 13:02:31 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-07 13:02:31 +0200
commit270e590e7ecdaa02d18d563b625d74604c328c0f (patch)
treedf949ce7f4e159c9a20e2e6d08a4f32d5f19c37f /redhat/tdebase
parent9114dd52f695fc2a1d139624472c43cac0bb4617 (diff)
parent66558bf7ba6bd4c25d1ebb13f233ea61bb9e0252 (diff)
downloadtde-packaging-270e590e7ecdaa02d18d563b625d74604c328c0f.tar.gz
tde-packaging-270e590e7ecdaa02d18d563b625d74604c328c0f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdebase')
-rw-r--r--redhat/tdebase/kdebase-3.5.12.spec (renamed from redhat/tdebase/trinity-kdebase-3.5.12.spec)0
-rw-r--r--redhat/tdebase/kdebase-3.5.13.1.spec (renamed from redhat/tdebase/trinity-kdebase-3.5.13.1.spec)0
-rw-r--r--redhat/tdebase/kdebase-3.5.13.spec (renamed from redhat/tdebase/trinity-kdebase-3.5.13.spec)0
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec (renamed from redhat/tdebase/trinity-tdebase-14.0.0.spec)4
-rw-r--r--redhat/tdebase/tdebase-3.5.13.2.spec (renamed from redhat/tdebase/trinity-tdebase-3.5.13.2.spec)0
5 files changed, 2 insertions, 2 deletions
diff --git a/redhat/tdebase/trinity-kdebase-3.5.12.spec b/redhat/tdebase/kdebase-3.5.12.spec
index 9982abd3a..9982abd3a 100644
--- a/redhat/tdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/tdebase/kdebase-3.5.12.spec
diff --git a/redhat/tdebase/trinity-kdebase-3.5.13.1.spec b/redhat/tdebase/kdebase-3.5.13.1.spec
index f58a045fb..f58a045fb 100644
--- a/redhat/tdebase/trinity-kdebase-3.5.13.1.spec
+++ b/redhat/tdebase/kdebase-3.5.13.1.spec
diff --git a/redhat/tdebase/trinity-kdebase-3.5.13.spec b/redhat/tdebase/kdebase-3.5.13.spec
index 5e69920e9..5e69920e9 100644
--- a/redhat/tdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/tdebase/kdebase-3.5.13.spec
diff --git a/redhat/tdebase/trinity-tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 54c5f56b7..8c1104287 100644
--- a/redhat/tdebase/trinity-tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -249,7 +249,7 @@ Requires: opensuse-manuals_en
%endif
BuildRequires: cmake >= 2.8
-BuildRequires: trinity-tqt3-devel >= %{version}
+BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
@@ -487,7 +487,7 @@ Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
Requires: trinity-tqtinterface >= %{version}
Requires: trinity-arts >= %{version}
Requires: trinity-tdelibs >= %{version}
-Requires: trinity-tqt3 >= %{version}
+Requires: trinity-tqt3 >= 3.5.0
Requires: openssl
diff --git a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 48e7b887a..48e7b887a 100644
--- a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec