RPM Packaging: initial support for R14.0.0

2 files changed, 126 insertions, 71 deletions

diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
new file mode 100644
index 000000000..b8acfe94d
--- /dev/null
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -0,0 +1,126 @@
+# Always install under standard prefix
+%define tde_prefix /usr
+
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-dbus-tqt
+Version:	14.0.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+License:	GPL
+Summary:	Dbus TQT Interface
+Group:		System Environment/Libraries
+
+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}%{?preversion:~%{preversion}}.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:	trinity-tqt3-devel >= %{version}
+
+Requires:		trinity-tqt3 >= %{version}
+
+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} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+
+%if 0%{?rhel} == 4
+%patch1 -p1 -b .dbustypes
+%endif
+
+
+%build
+unset QTDIR
+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
+%defattr(-,root,root,-)
+%{tde_libdir}/libdbus-tqt-1.so.0
+%{tde_libdir}/libdbus-tqt-1.so.0.0.0
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/dbus-1.0/*
+%{tde_libdir}/libdbus-tqt-1.so
+%{tde_libdir}/libdbus-tqt-1.la
+%{tde_libdir}/pkgconfig/dbus-tqt.pc
+
+%changelog
+* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec
deleted file mode 100644
index aaf57264a..000000000
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-r14.spec
+++ /dev/null
@@ -1,71 +0,0 @@
-# Always build under "/usr"
-%define _prefix /usr
-
-
-Name:		dbus-tqt
-Version:	r14
-Release:	1%{?dist}
-License:	GPL
-Summary:	Dbus TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}.tar.gz
-
-BuildRequires:	gcc-c++
-BuildRequires:	dbus-devel
-BuildRequires:	cmake >= 2.8
-BuildRequires:	tqt3-devel >= 3.4.0
-BuildRequires:	tqtinterface-devel
-Requires:		tqt3 >= 3.4.0
-Requires:		tqtinterface
-
-%description
-Dbus TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-
-%description devel
-Development files for %{name}
-
-
-%prep
-%setup -q -n dependencies/%{name}
-
-%build
-%__mkdir build
-cd build
-%cmake ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%{_libdir}/*.so.*
-
-%files devel
-%{_includedir}/dbus-1.0/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
-
-%changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'