RPM: massive update and cleanup

2 files changed, 1 insertions, 184 deletions

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
deleted file mode 100644
index 8e4771767..000000000
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ /dev/null
@@ -1,183 +0,0 @@
-#
-# 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
-
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
-%define libdbus %{_lib}dbus
-%else
-%define libdbus libdbus
-%endif
-
-
-Name:		trinity-dbus-1-tqt
-Epoch:		%{tde_epoch}
-Version:	0.9
-Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
-Summary:	Dbus bindings for the Trinity Qt [TQt] interface
-Group:		System/Libraries
-URL:		http://www.trinitydesktop.org/
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Project
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-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
-
-%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.
-
-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}
-
-%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 -n %{libdbus}-1-tqt0
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-1-tqt0
-%defattr(-,root,root,-)
-%{_libdir}/libdbus-1-tqt.so.0
-%{_libdir}/libdbus-1-tqt.so.0.0.0
-
-##########
-
-%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:		trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:		trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%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.
-
-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 -n %{libdbus}-1-tqt-devel
-/sbin/ldconfig || :
-
-%files -n %{libdbus}-1-tqt-devel
-%defattr(-,root,root,-)
-%{_bindir}/dbusxml2qt3
-%{_includedir}/*.h
-%{_libdir}/libdbus-1-tqt.so
-%{_libdir}/libdbus-1-tqt.la
-%{_libdir}/pkgconfig/*.pc
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=ON \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DBIN_INSTALL_DIR=%{_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
-  ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 7f8d9f3cb..1fdc0d328 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}