summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-11 12:51:59 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-11 12:51:59 +0200
commit1694f19592b5361f8ae519e5a5252f6a41f71ab7 (patch)
tree217915f73380b8c93068cb6c9141ec18dd447700 /redhat/dependencies
parentb4aa46185c7e88b2c1abb0a8a00652132f32eb77 (diff)
downloadtde-packaging-1694f19592b5361f8ae519e5a5252f6a41f71ab7.tar.gz
tde-packaging-1694f19592b5361f8ae519e5a5252f6a41f71ab7.zip
RPM Packaging: update dbus-1-tqt
Diffstat (limited to 'redhat/dependencies')
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec7
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec151
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
3 files changed, 109 insertions, 51 deletions
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 067cc3e7c..5dde03ebf 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package dbus-1-tqt
+# spec file for package dbus-1-tqt (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -16,6 +16,7 @@
#
# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
@@ -26,7 +27,7 @@
Name: trinity-dbus-1-tqt
-Epoch: 2
+Epoch: %{tde_epoch}
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: dbus bindings for the Trinity Qt [TQt] interface
@@ -48,7 +49,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
-BuildRequires: libtqt4-devel >= 2:4.2.0
+BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
index f89fcf807..9501883b8 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
@@ -1,89 +1,147 @@
-# TDE specific building variables
+#
+# spec file for package dbus-1-tqt (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 1
%define tde_version 3.5.13.2
-%define tde_prefix /usr
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
Name: trinity-dbus-1-tqt
-Epoch: 1
+Epoch: %{tde_epoch}
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License: GPL
-Summary: Dbus TQT Interface
-Group: System Environment/Libraries
+Summary: dbus bindings for the Trinity Qt [TQt] interface
+Group: System/Libraries
+URL: http://www.trinitydesktop.org/
-Obsoletes: dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+#Vendor: Trinity Project
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
+Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRequires: qt3-devel >= 3.3.8d
+BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
+
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+
+# DBUS support
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
%else
BuildRequires: dbus-devel
%endif
-BuildRequires: cmake >= 2.8
-BuildRequires: qt3-devel >= 3.3.8d
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-Requires: qt3 >= 3.3.8d
+%description
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
+This package provides bindings for the Trinity Qt TQt interface.
-%description
-Dbus TQT Interface
+See the dbus description for more information about D-BUS in general.
+
+###########
+
+%package -n %{libdbus}-1-tqt0
+Summary: dbus bindings for the Trinity Qt [TQt] interface
+Group: System/Libraries
+Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%post
+%description -n %{libdbus}-1-tqt0
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
+
+This package provides bindings for the Trinity Qt TQt interface.
+
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%postun
+%postun -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%files
+%files -n %{libdbus}-1-tqt0
%defattr(-,root,root,-)
-%{tde_bindir}/dbusxml2qt3
-%{tde_libdir}/libdbus-1-tqt.so.0
-%{tde_libdir}/libdbus-1-tqt.so.0.0.0
+%{_libdir}/libdbus-1-tqt.so.0
+%{_libdir}/libdbus-1-tqt.so.0.0.0
##########
-%package devel
-Requires: %{name}
-Summary: %{name} - Development files
-Group: Development/Libraries
+%package -n %{libdbus}-1-tqt-devel
+Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
+Group: Development/Libraries/C and C++
+Provides: libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description devel
-Development files for %{name}
+%description -n %{libdbus}-1-tqt-devel
+D-BUS is a message bus, used for sending messages between applications.
+Conceptually, it fits somewhere in between raw sockets and CORBA in
+terms of complexity.
-%post devel
+This package provides bindings for the Trinity Qt TQt interface.
+
+See the dbus description for more information about D-BUS in general.
+
+%post -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%postun devel
+%postun -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%files devel
+%files -n %{libdbus}-1-tqt-devel
%defattr(-,root,root,-)
-%{tde_includedir}/*.h
-%{tde_libdir}/libdbus-1-tqt.so
-%{tde_libdir}/libdbus-1-tqt.la
-%{tde_libdir}/pkgconfig/*.pc
+%{_bindir}/dbusxml2qt3
+%{_includedir}/*.h
+%{_libdir}/libdbus-1-tqt.so
+%{_libdir}/libdbus-1-tqt.la
+%{_libdir}/pkgconfig/*.pc
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
%debug_package
%endif
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -91,8 +149,7 @@ Development files for %{name}
%build
unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt?.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+. /etc/profile.d/qt3.sh
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
@@ -106,9 +163,9 @@ fi
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
\
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DBIN_INSTALL_DIR=%{_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{_includedir} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
..
%__make %{?_smp_mflags}
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index b8efae18a..48b6bd825 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tqt3
+# spec file for package tqt3 (version R14.0.0)
#
# Copyright (c) 2014 Trinity Desktop Environment
#