summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec5
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-14.0.0.spec1
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-14.0.0.spec2
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec8
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec2
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
6 files changed, 14 insertions, 6 deletions
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 7657a1bdc..ecee40f36 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
@@ -118,6 +118,5 @@ cd build
%changelog
-* Thu Feb 16 2012 Francois Andriot <[email protected]> - 14.0.0-1
-- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
-
+* Fri Jul 05 2013 Francois Andriot <[email protected]> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index b57f85887..fbe3bf8d2 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -59,6 +59,7 @@ easy to integrate CalDAV support into any PIM application.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+
Obsoletes: libcaldav-devel < %{version}-%{release}
Provides: libcaldav-devel = %{version}-%{release}
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index cbe4b1128..42ba6579e 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -56,7 +56,7 @@ Build dependencies are minimal, requiring only libcurl.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}
+Requires: %{name} = %{version}-%{release}
Obsoletes: libcarddav-devel < %{version}-%{release}
Provides: libcarddav-devel = %{version}-%{release}
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 1e33edf24..e86012b01 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -29,10 +29,16 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: python-tqt-14.0.0-ftbfs.patch
BuildRequires: gcc-c++
-BuildRequires: python-sip
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tqscintilla-devel
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: sip-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: python-sip
+%endif
+
# TDE specific building variables
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 7d46981ae..083cfcf91 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -17,7 +17,7 @@
Name: trinity-tqca
Version: 1.0
-Release: 3%{?dist}%{?_variant}
+Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
Summary: TQt Cryptographic Architecture
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 2b178e846..9c7169d79 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -262,7 +262,9 @@ This package contains a graphical configuration tool for programs using TQt 3.
%package devel
Summary: Development files for the TQt 3 GUI toolkit
Group: Development/Libraries
+
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-designer = %{version}-%{release}
%description devel
The %{name}-devel package contains the files necessary to develop