From 7834467b40a454432c3f8d84b6b43e299afe4933 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sun, 21 Oct 2012 19:20:20 +0200 Subject: RHEL/Fedora/MGA/MDV/Suse: update dependencies for TDE 3.5.13.1 --- .../dbus-tqt-3.5.13-fix_old_dbus_types.patch | 44 ++++++++ .../dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec | 125 +++++++++++++++++++++ redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec | 50 +++++++-- 3 files changed, 207 insertions(+), 12 deletions(-) create mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch create mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec (limited to 'redhat/dependencies/dbus-tqt') diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch new file mode 100644 index 000000000..e9e873d63 --- /dev/null +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch @@ -0,0 +1,44 @@ +--- dbus-tqt/message.cpp.dbustypes 2011-08-24 20:23:14.000000000 +0200 ++++ dbus-tqt/message.cpp 2012-09-06 19:54:47.037175413 +0200 +@@ -187,28 +210,28 @@ + case DBUS_TYPE_INT32: + { + dbus_int32_t v; +- dbus_message_iter_get_basic (i, &v); ++ dbus_message_iter_get_int32 (i); + ret = TQVariant( v ); + } + break; + case DBUS_TYPE_UINT32: + { + dbus_uint32_t v; +- dbus_message_iter_get_basic (i, &v); ++ dbus_message_iter_get_uint32 (i); + ret = TQVariant( v ); + } + break; + case DBUS_TYPE_DOUBLE: + { + double v; +- dbus_message_iter_get_basic (i, &v); ++ dbus_message_iter_get_double (i); + ret = TQVariant( v ); + } + break; + case DBUS_TYPE_STRING: + { + const char *v; +- dbus_message_iter_get_basic (i, &v); ++ dbus_message_iter_get_string (i); + ret = TQVariant( v ); + } + break; +@@ -241,7 +264,7 @@ + while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) + { + const char *v; +- dbus_message_iter_get_basic (&sub, &v); ++ dbus_message_iter_get_string (&sub); + tempList.append( TQString( v ) ); + dbus_message_iter_next (&sub); + } diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec new file mode 100644 index 000000000..0fd6323fc --- /dev/null +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec @@ -0,0 +1,125 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} + +Name: trinity-dbus-tqt +Version: 3.5.13.1 +Release: 1%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: dbus-tqt-3.5.13.1.tar.gz + +# [dbus-tqt] Fix build on RHEL 4 +Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch + +BuildRequires: gcc-c++ +%if 0%{?suse_version} +BuildRequires: dbus-1-devel +%else +BuildRequires: dbus-devel +%endif +BuildRequires: trinity-tqtinterface-devel >= %{version} + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: qt3-devel + +Requires: qt3 + +Obsoletes: dbus-tqt < %{version}-%{release} +Provides: dbus-tqt = %{version}-%{release} + + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +Obsoletes: dbus-tqt-devel < %{version}-%{release} +Provides: dbus-tqt-devel = %{version}-%{release} + +%description devel +Development files for %{name} + + +%if 0%{?suse_version} +%debug_package +%endif + + +%prep +%setup -q -n dbus-tqt-3.5.13.1 + +%if 0%{?rhel} == 4 +%patch1 -p1 -b .dbustypes +%endif + +%build +unset QTDIR || : ; . /etc/profile.d/qt?.sh +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +%if 0%{?rhel} == 4 +export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" +%endif + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%post +/sbin/ldconfig || : + +%postun +/sbin/ldconfig || : + +%post devel +/sbin/ldconfig || : + +%postun devel +/sbin/ldconfig || : + +%files +%{tde_libdir}/libdbus-tqt-1.so.0 +%{tde_libdir}/libdbus-tqt-1.so.0.0.0 + +%files devel +%{tde_includedir}/dbus-1.0/* +%{tde_libdir}/libdbus-tqt-1.so +%{tde_libdir}/libdbus-tqt-1.la +%{tde_libdir}/pkgconfig/dbus-tqt.pc + +%changelog +* Tue Sep 11 2012 Francois Andriot - 3.5.13.1-1 +- Initial build for TDE 3.5.13.1 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 fbeb990ed..2ee2c1a8a 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -6,7 +6,7 @@ %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -Name: dbus-tqt +Name: trinity-dbus-tqt Version: 3.5.13 Release: 3%{?dist}%{?_variant} License: GPL @@ -19,17 +19,27 @@ Packager: Francois Andriot Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}.tar.gz +Source0: dbus-tqt-3.5.13.tar.gz + +# [dbus-tqt] Fix build on RHEL 4 +Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch BuildRequires: gcc-c++ +%if 0%{?suse_version} +BuildRequires: dbus-1-devel +%else BuildRequires: dbus-devel +%endif BuildRequires: tqtinterface-devel >= 3.5.13 # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -BuildRequires: qt3-devel >= 3.3.8.d +BuildRequires: qt3-devel + +Requires: qt3 -Requires: qt3 >= 3.3.8.d +Obsoletes: dbus-tqt < %{version}-%{release} +Provides: dbus-tqt = %{version}-%{release} %description @@ -40,20 +50,35 @@ Dbus TQT Interface Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries -#Provides: dbus-qt-devel + +Obsoletes: dbus-tqt-devel < %{version}-%{release} +Provides: dbus-tqt-devel = %{version}-%{release} %description devel Development files for %{name} +%if 0%{?suse_version} +%debug_package +%endif + + %prep -%setup -q -n dependencies/%{name} +%setup -q -n dependencies/dbus-tqt + +%if 0%{?rhel} == 4 +%patch1 -p1 -b .dbustypes +%endif %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . /etc/profile.d/qt?.sh export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?rhel} == 4 +export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" +%endif + +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %__mkdir_p build cd build %endif @@ -86,13 +111,14 @@ cd build /sbin/ldconfig || : %files -%{tde_libdir}/*.so.* +%{tde_libdir}/libdbus-tqt-1.so.0 +%{tde_libdir}/libdbus-tqt-1.so.0.0.0 %files devel %{tde_includedir}/dbus-1.0/* -%{tde_libdir}/*.so -%{tde_libdir}/*.la -%{tde_libdir}/pkgconfig/*.pc +%{tde_libdir}/libdbus-tqt-1.so +%{tde_libdir}/libdbus-tqt-1.la +%{tde_libdir}/pkgconfig/dbus-tqt.pc %changelog * Wed May 02 2012 Francois Andriot - 3.5.13-3 -- cgit v1.2.3