RPM Packaging: updates for R14

5 files changed, 105 insertions, 11 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 \
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch
new file mode 100644
index 000000000..095b5508c
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch
@@ -0,0 +1,64 @@
+diff --git a/configure b/configure
+index 0ced074..7a6fcfe 100755
+--- a/configure
++++ b/configure
+@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
+ done
+ 
+ 
+-echo "Configuring qca-tls ..."
++echo "Configuring tqca-tls ..."
+ 
+ if [ "$QC_DEBUG" = "Y" ]; then
+ echo
+diff --git a/qca-tls.pro b/qca-tls.pro
+index c1541bf..2457746 100644
+--- a/qca-tls.pro
++++ b/qca-tls.pro
+@@ -1,8 +1,8 @@
+-# qca-tls qmake profile
++# tqca-tls qmake profile
+ 
+ TEMPLATE = lib
+ CONFIG  += qt thread release plugin
+-TARGET   = qca-tls
++TARGET   = tqca-tls
+ 
+ !exists(qcaprovider.h) {
+   Q_PREFIX = ../../src
+@@ -13,9 +13,9 @@ HEADERS += ($$Q_PREFIX)qcaprovider.h
+ HEADERS = qca-tls.h
+ SOURCES = qca-tls.cpp
+ 
+-DEFINES += QCA_PLUGIN
++DEFINES += TQCA_PLUGIN
+ win32:{
+-	DEFINES += QCA_PLUGIN_DLL OSSL_097
++	DEFINES += TQCA_PLUGIN_DLL OSSL_097
+ 	INCLUDEPATH += c:\local\include
+ 	LIBS += c:\local\lib\libeay32.lib c:\local\lib\ssleay32.lib
+ }
+diff --git a/qca-tls.qc b/qca-tls.qc
+index ef0a739..91179cf 100644
+--- a/qca-tls.qc
++++ b/qca-tls.qc
+@@ -1,5 +1,5 @@
+ <qconf>
+- <name>qca-tls</name>
++ <name>tqca-tls</name>
+  <profile>qca-tls.pro</profile>
+  <noprefix/>
+  <dep type='openssl'>
+diff --git a/qca.h b/qca.h
+index 184a4b0..ccd6d03 100644
+--- a/qca.h
++++ b/qca.h
+@@ -49,7 +49,7 @@
+ #  endif
+ #endif
+ #ifndef TQCA_PLUGIN_EXPORT
+-#define TQCA_PLUGIN_EXPORT extern "C"
++#define TQCA_PLUGIN_EXPORT extern "C" __attribute__ ((visibility ("default")))
+ #endif
+ 
+ class TQHostAddress;
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 b8bbfb5c8..c6dc18eff 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -30,6 +30,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:			tqca-tls-14.0.0-visibility.patch
+
 BuildRequires:  trinity-tqt3-devel >= 3.5.0
 BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-tqca-devel >= 1.0
@@ -52,6 +54,7 @@ contains the TLS plugin.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .visibility
 
 
 %build
@@ -77,7 +80,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 %files
 %defattr(0644,root,root,0755)
 %doc README COPYING
-%{_libdir}/tqt3/plugins/crypto/libqca-tls.so
+%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so
 
 
 %changelog
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index aa2813914..dcabb903f 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -26,8 +26,6 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Patch1:		tqt3-14.0.0-shared_lib.patch
 # [tqt3] Fix FTBFS
 Patch2:		tqt3-14.0.0-fix_ftbfs.patch
-# [tqt3] Fix GLIB initialization
-Patch3:		tqt3-14.0.0-fix_glib_init.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
@@ -430,7 +428,15 @@ for the TQt 3 toolkit.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .sharedlibs
 %patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .glibinit
+
+# fix variables in 'qmake.conf'
+%__sed -i mkspecs/*/qmake.conf \
+  -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT		= /usr/include/tqt3|" \
+  -e "s|\$(QTDIR)|/usr|g" \
+  -e "s|-lqt|-ltqt|g" \
+  -e "s|^QMAKE_STRIP             =.*|QMAKE_STRIP             =|" \
+  -e "s|^QMAKE_STRIPFLAGS_LIB 	+=.*|QMAKE_STRIPFLAGS_LIB 	+=|"
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -549,12 +555,6 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h
 # fix .prl files
 %__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g"
 
-# fix QTDIR in 'qmake.conf'
-%__sed -i mkspecs/*/qmake.conf \
-  -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT		= /usr/include/tqt3|" \
-  -e "s|\$(QTDIR)|/usr|g" \
-  -e "s|-lqt|-ltqt|g"
-
 
 %install
 %__rm -rf %{buildroot}