summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/dbus-1-tqt
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/dbus-1-tqt')
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec115
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec35
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch16
3 files changed, 140 insertions, 26 deletions
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
new file mode 100644
index 000000000..cfeb49b55
--- /dev/null
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
@@ -0,0 +1,115 @@
+# 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_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name: trinity-dbus-1-tqt
+Version: 3.5.13.1
+Release: 1%{?dist}%{?_variant}
+License: GPL
+Summary: Dbus TQT Interface
+Group: System Environment/Libraries
+
+Obsoletes: dbus-1-tqt < %{version}-%{release}
+Provides: dbus-1-tqt = %{version}-%{release}
+
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0: dbus-1-tqt-3.5.13.1.tar.gz
+
+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
+
+
+%description
+Dbus TQT Interface
+
+
+%package devel
+Requires: %{name}
+Summary: %{name} - Development files
+Group: Development/Libraries
+
+Obsoletes: dbus-1-tqt-devel < %{version}-%{release}
+Provides: dbus-1-tqt-devel = %{version}-%{release}
+
+%description devel
+Development files for %{name}
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n dbus-1-tqt-3.5.13.1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt?.sh
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -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_bindir}/dbusxml2qt3
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+
+%files devel
+%{tde_includedir}/*.h
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
+%{tde_libdir}/pkgconfig/*.pc
+
+%changelog
+* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial build for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index 3e1bd40fb..5e3e98d18 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -7,29 +7,36 @@
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-Name: dbus-1-tqt
+Name: trinity-dbus-1-tqt
Version: 3.5.13
Release: 1%{?dist}%{?_variant}
License: GPL
Summary: Dbus TQT Interface
Group: System Environment/Libraries
+Obsoletes: dbus-1-tqt < %{version}-%{release}
+Provides: dbus-1-tqt = %{version}-%{release}
+
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{version}.tar.gz
+Source0: dbus-1-tqt-3.5.13.tar.gz
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
-Requires: qt3 >= 3.3.8.d
+BuildRequires: qt3-devel
+Requires: qt3
%description
@@ -41,18 +48,25 @@ Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
+Obsoletes: dbus-1-tqt-devel < %{version}-%{release}
+Provides: dbus-1-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-1-tqt
%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} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
@@ -87,12 +101,13 @@ cd build
%files
%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/*.so.*
+%{tde_libdir}/libdbus-1-tqt.so.0
+%{tde_libdir}/libdbus-1-tqt.so.0.0.0
%files devel
%{tde_includedir}/*.h
-%{tde_libdir}/*.so
-%{tde_libdir}/*.la
+%{tde_libdir}/libdbus-1-tqt.so
+%{tde_libdir}/libdbus-1-tqt.la
%{tde_libdir}/pkgconfig/*.pc
%changelog
diff --git a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch
deleted file mode 100644
index cae8fea03..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dbus-1-tqt/tqdbusconnection.cpp.ORI 2011-11-11 20:37:57.684881138 +0100
-+++ dbus-1-tqt/tqdbusconnection.cpp 2011-11-11 20:40:33.910795465 +0100
-@@ -285,7 +285,12 @@
-
- dbus_message_unref(msg);
-
-- return TQT_DBusMessage::fromDBusMessage(reply);
-+ TQT_DBusMessage mess = TQT_DBusMessage::fromDBusMessage(reply);
-+
-+ /* XXX fromDbusMessage do a ref(), avoid leaking */
-+ dbus_message_unref(reply);
-+
-+ return mess;
- }
-
- void TQT_DBusConnection::flush() const