From c8ae6831b95e699caca3557ba0fae59310059e39 Mon Sep 17 00:00:00 2001 From: François Andriot Date: Tue, 1 Oct 2013 11:23:44 +0200 Subject: RPM Packaging: update python-tqt --- .../python-tqt/python-tqt-14.0.0-ftbfs.patch | 33 ---------------------- .../dependencies/python-tqt/python-tqt-14.0.0.spec | 4 +-- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch deleted file mode 100644 index 069111d3e..000000000 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI 2013-07-03 20:23:06.054830311 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip 2013-07-03 20:23:14.833911835 +0200 -@@ -2196,7 +2196,7 @@ - // See if it is a TQt signal. - if (*sig == '2') - { -- pyqt3TQtSignal *tab; -+ pyqt3QtSignal *tab; - - // Search the table. - for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab) ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py.ORI 2013-07-23 18:00:47.017942165 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py 2013-07-23 18:01:40.757575552 +0200 -@@ -321,6 +321,9 @@ - makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") - makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3")) - -+ if not os.access("pyuic3", os.F_OK): -+ os.mkdir("pyuic3") -+ - makefile.generate() - tool_dirs.append("pyuic3") - -@@ -350,6 +353,9 @@ - - makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) - -+ if not os.access("pylupdate3", os.F_OK): -+ os.mkdir("pylupdate3") -+ - makefile.generate() - tool_dirs.append("pylupdate3") - elif qt_version >= 0x020000: 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 f516327d7..0fdbb572f 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -24,10 +24,9 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: python-tqt-14.0.0-ftbfs.patch BuildRequires: gcc-c++ -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqscintilla-devel %if 0%{?rhel} || 0%{?fedora} @@ -140,7 +139,6 @@ packages based on them, like PyTDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %build -- cgit v1.2.3