diff options
| author | François Andriot <[email protected]> | 2013-07-24 11:25:02 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2013-07-24 11:25:02 +0200 |
| commit | 0c4b32438a57f52601dfe66d133bd263a5d304ee (patch) | |
| tree | 9389a6db04f282ab54a2cc4ca8f55124285a5fa4 /redhat/dependencies/python-tqt | |
| parent | 700ec263535470631ef4f6fb816000500eb4227e (diff) | |
| download | tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.tar.gz tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.zip | |
RPM Packaging: updates for R14
Diffstat (limited to 'redhat/dependencies/python-tqt')
| -rw-r--r-- | redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch | 22 | ||||
| -rw-r--r-- | redhat/dependencies/python-tqt/python-tqt-14.0.0.spec | 7 |
2 files changed, 28 insertions, 1 deletions
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 index 7716f3597..069111d3e 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch @@ -9,3 +9,25 @@ // 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 36323f4e2..46fac8e28 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -119,6 +119,7 @@ Linguist translation files from Python code. %package devel Summary: TQt bindings for Python - Development files Requires: %{name} = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} %description devel Development .sip files with definitions of PyQt classes. They @@ -127,7 +128,7 @@ packages based on them, like PyKDE. %files devel %defattr(-,root,root,-) -%{python_sitearch}/pyqtconfig.py +%{python_sitearch}/pyqtconfig.py* %{_datadir}/sip/tqt/ ########## @@ -147,6 +148,10 @@ unset QTDIR QTINC QTLIB mkdir build cd build + +# WTF ? CentOS 6 ! +cp -rf ../pyuic3 ../pylupdate3 . + echo yes | python ../configure.py \ -c -n %{_includedir}/tqscintilla \ -q /usr/share/tqt3 \ |