summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-06-27 13:54:24 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-06-27 13:54:24 +0200
commit4ee30a7fc0bc8782f1d8657c9fdb32158ec84f83 (patch)
treeb6eddf537f02ef2492abae7a6427f63e5bb46405 /redhat
parent14aa9dd4948db58c958c37ec93648d0e757b1610 (diff)
parent98bfbb131544aa506fb02a1cdf0802014f3cf993 (diff)
downloadtde-packaging-4ee30a7fc0bc8782f1d8657c9fdb32158ec84f83.tar.gz
tde-packaging-4ee30a7fc0bc8782f1d8657c9fdb32158ec84f83.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec2
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec2
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec1
-rw-r--r--redhat/applications/wlassistant/wlassistant-14.0.0.spec1
4 files changed, 3 insertions, 3 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index b9977cd98..cb5e1e954 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -367,7 +367,7 @@ fi
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Conflicts: %{name} <= %{version}-%{release}
-Requires: trinity-kdelibs
+Requires: trinity-tdelibs
License: LGPLv2+
%description libs
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 34dfb6606..22cfb1166 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -328,7 +328,7 @@ fi
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Conflicts: %{name} <= %{version}-%{release}
-Requires: trinity-kdelibs
+Requires: trinity-tdelibs
License: LGPLv2+
%description libs
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index 338795cbe..b4190ad5e 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -58,6 +58,7 @@ Source1: kde-settings-laptops.directory
Patch0: %{tde_pkg}-%{tde_version}.patch
+
Provides: trinity-kde-systemsettings = %{version}-%{release}
Obsoletes: trinity-kde-systemsettings < %{version}-%{release}
Provides: trinity-systemsettings = %{version}-%{release}
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
index cd981bc4c..2ad812d24 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec
@@ -98,7 +98,6 @@ BuildRequires: libidn-devel
%define with_gamin 1
BuildRequires: gamin-devel
%endif
-
# PYTHON support
BuildRequires: python