From 05d7831a8ff523d690f12e34313a4e3903714235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 22 Oct 2014 20:06:48 +0200 Subject: RPM Packaging: update tqscintilla --- redhat/dependencies/arts/arts-14.0.0.spec | 2 +- redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec | 2 +- redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec | 2 +- redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec | 2 +- redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec | 2 +- redhat/dependencies/python-tqt/python-tqt-14.0.0.spec | 1 + redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec | 8 +++++--- redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec | 2 +- redhat/dependencies/tqca/tqca-14.0.0.spec | 2 +- redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec | 1 + redhat/dependencies/tqt3/tqt3-14.0.0.spec | 2 +- redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) (limited to 'redhat') diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index d3b43c061..ab8473689 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -242,7 +242,7 @@ intended for systems running the Pulseaudio server. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 f0c4c250a..41d6c5f7f 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -176,7 +176,7 @@ into a TQt main loop application. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 e20b0c3b1..6bc4313ac 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 @@ -137,7 +137,7 @@ See the dbus description for more information about D-BUS in general. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index fe8c2948e..7f63f8bae 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -138,7 +138,7 @@ See the dbus description for more information about D-BUS in general. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index edafd991c..3f4acc2fd 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -165,7 +165,7 @@ especially suitable for embedded applications. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif 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 d6e5050af..4ee94f3ff 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -70,6 +70,7 @@ Obsoletes: trinity-python-qt3 BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5 +BuildRequires: tqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ BuildRequires: python diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec index 991ea0a33..7e10966e9 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec @@ -70,9 +70,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} -Requires: trinity-filesystem >= %{tde_version} BuildRequires: gcc-c++ BuildRequires: python @@ -88,6 +87,8 @@ specificity towards C++ and Python. %package -n sip4-tqt Summary: Python/C++ bindings generator (Runtime Library) Group: Development/Tools/Building +Requires: trinity-filesystem >= %{tde_version} +Requires: python %description -n sip4-tqt SIP is a tool for generating bindings for C++ classes with some ideas @@ -107,7 +108,8 @@ specificity towards C++ and Python. %package -n sip4-tqt-devel Summary: Python/C++ bindings generator (Development Files) Group: Development/Libraries/Python -Requires: sip4-tqt = %{version}-%{release} +Requires: sip4-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: python-devel %description -n sip4-tqt-devel SIP is a tool for generating bindings for C++ classes with some ideas diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index 8c24acab0..3fe36ac35 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -43,7 +43,7 @@ contains the TLS plugin. ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 093461890..66c0c5f35 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -80,7 +80,7 @@ This packages contains the development files for TQCA ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index a9cb33827..09bbd4a72 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -56,6 +56,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: gcc-c++ %description Scintilla is a free source code editing component. It has features found diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 22fbc9611..a55d14c49 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -1229,7 +1229,7 @@ things that are possible with TQt3. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 164552d13..95a41864d 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -204,7 +204,7 @@ although some code has been added for useful functions that are no longer part o ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif -- cgit v1.2.1