summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:12:23 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:12:23 +0200
commit7e2a657f849a528ef6c4e26e34237b0b6c50caaa (patch)
treec5a3752646a7b7f61aedee2b6113b57f272df893
parent01d4b602ce624d96a0d9574e8e5f6fba53f2d9d9 (diff)
downloadtde-packaging-7e2a657f849a528ef6c4e26e34237b0b6c50caaa.tar.gz
tde-packaging-7e2a657f849a528ef6c4e26e34237b0b6c50caaa.zip
RHEL/Fedora: TQTinterface updates
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec9
-rw-r--r--redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch14
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec9
3 files changed, 28 insertions, 4 deletions
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index 670a6f9d5..556479efc 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -11,8 +11,8 @@
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel >= 3.3.8d
-Requires: qt3 >= 3.3.8d
+BuildRequires: qt3-devel >= 3.3.8.d
+Requires: qt3 >= 3.3.8.d
Name: dbus-tqt
@@ -81,6 +81,9 @@ cd build
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Updates BuildRequires
+
* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch
new file mode 100644
index 000000000..9f4dc4eed
--- /dev/null
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch
@@ -0,0 +1,14 @@
+--- tqtinterface/qtinterface/tqt.h.cmake.orig 2011-10-09 02:40:38.000000000 -0400
++++ tqtinterface/qtinterface/tqt.h.cmake 2012-05-01 15:10:09.220681454 -0400
+@@ -74,6 +74,11 @@
+ #define TQS_OK QS_OK
+ #define TQTSFUNC QTSFUNC
+ #define TQ_TYPENAME Q_TYPENAME
++
++#define TQ_BYTE_ORDER Q_BYTE_ORDER
++#define TQ_LITTLE_ENDIAN Q_LITTLE_ENDIAN
++#define TQ_BIG_ENDIAN Q_BIG_ENDIAN
++
+ #define TQT_CHECK_INVALID_MAP_ELEMENT QT_CHECK_INVALID_MAP_ELEMENT
+
+ #define TQT_VERSION QT_VERSION
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index a63e8a814..bbb9a48d7 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -37,6 +37,8 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
+# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
+Patch1: tqtinterface-3.5.13-add_missing_endianness_defines.patch
BuildRequires: gcc-c++
BuildRequires: libXi-devel
@@ -57,6 +59,7 @@ Development files for %{name}
%prep
%setup -q -n dependencies/%{name}
+%patch1 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -110,6 +113,10 @@ done
%changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Rebuilt for Fedora 17
+- Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
+
* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing Requires