RPM Packaging: initial support for R14.0.0

2 files changed, 170 insertions, 91 deletions

diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
new file mode 100755
index 000000000..5a86f514a
--- /dev/null
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -0,0 +1,170 @@
+# Always build under "/usr"
+%define tde_prefix /usr
+%define cmake_modules_dir %{_datadir}/cmake/Modules
+
+# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
+# Later compiled Trinity products should be aware of that !
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+Name:		trinity-tqtinterface
+Version:	14.0.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+License:	GPL
+Summary:	Trinity QT Interface
+Group:		System Environment/Libraries
+
+Vendor:		Trinity Project
+URL:		http://www.trinitydesktop.org/
+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
+
+# TDE 3.5.13 specific building variables
+BuildRequires:	cmake >= 2.8
+BuildRequires:	trinity-tqt3-devel >= 14.0.0
+Requires:		trinity-tqt3 >= 14.0.0
+
+BuildRequires:	gcc-c++
+
+# PTHREAD support
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+BuildRequires:	pth-devel
+%endif
+
+# X11 libraries
+%if 0%{?rhel} == 4
+BuildRequires:	xorg-x11-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xi-devel
+%endif
+%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
+BuildRequires:	libXi-devel
+%endif
+%if 0%{?suse_version} == 1140
+BuildRequires:	libXi6-devel
+%endif
+
+Obsoletes:	tqtinterface < %{version}-%{release}
+Provides:	tqtinterface = %{version}-%{release}
+
+
+%description
+Trinity QT Interface
+
+%package devel
+Group:		Development/Libraries
+Summary:	%{name} - Development files
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-tqt3-devel >= 14.0.0
+
+Obsoletes:	tqtinterface-devel < %{version}-%{release}
+Provides:	tqtinterface-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}}
+
+%build
+unset QTDIR
+
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+	-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
+	-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+	-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
+	-DCMAKE_LIBRARY_PATH="%{tde_libdir}" \
+	-DCMAKE_INCLUDE_PATH="%{tde_includedir}" \
+	-DCMAKE_VERBOSE_MAKEFILE="ON" \
+	-DWITH_QT3="ON" \
+	-DQTDIR="%{tde_datadir}/tqt3" \
+	-DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \
+	-DQT_LIBRARY_DIRS="%{tde_libdir}" \
+	-DBUILD_ALL="ON" \
+	-DUSE_QT3="ON" \
+	..
+
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__make install DESTDIR=%{?buildroot} -C build
+
+# RHEL 5: add newline at end of include files to avoid warnings
+%if 0%{?rhel} && 0%{?rhel} <= 5
+for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
+  echo "" >>${i}
+done
+%endif
+
+# Install 'cmake' modules for development use
+%__mkdir_p %{?buildroot}%{cmake_modules_dir}
+for i in cmake/modules/*.cmake; do
+  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+done
+
+%clean
+%__rm -rf %{?buildroot}
+
+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/convert_qt_tqt1
+%{tde_bindir}/convert_qt_tqt2
+%{tde_bindir}/convert_qt_tqt3
+%{tde_bindir}/dcopidl-tqt
+%{tde_bindir}/dcopidl2cpp-tqt
+%{tde_bindir}/dcopidlng-tqt
+%{tde_bindir}/mcopidl-tqt
+%{tde_bindir}/moc-tqt
+%{tde_bindir}/tmoc
+%{tde_bindir}/tqt-replace
+%{tde_bindir}/tqt-replace-stream
+%{tde_bindir}/uic-tqt
+%{tde_libdir}/libtqassistantclient.so.4
+%{tde_libdir}/libtqassistantclient.so.4.2.0
+%{tde_libdir}/libtqt.so.4
+%{tde_libdir}/libtqt.so.4.2.0
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_includedir}/tqt/
+%{tde_libdir}/libtqassistantclient.la
+%{tde_libdir}/libtqassistantclient.so
+%{tde_libdir}/libtqt.la
+%{tde_libdir}/libtqt.so
+%{tde_libdir}/pkgconfig/tqt.pc
+%{tde_libdir}/pkgconfig/tqtqui.pc
+%{cmake_modules_dir}/*.cmake
+
+
+%changelog
+* Tue Feb 14 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/tqtinterface/tqtinterface-r14.spec b/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
deleted file mode 100755
index 18c9c463b..000000000
--- a/redhat/dependencies/tqtinterface/tqtinterface-r14.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-# Always build under "/usr"
-%define _prefix /usr
-%define cmake_modules_dir %{_datadir}/cmake/Modules
-
-Name:		tqtinterface
-Version:	r14
-Release:	1%{?dist}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}.tar.gz
-
-
-BuildRequires:	cmake >= 2.8
-BuildRequires:	tqt3-devel >= 3.4.0
-BuildRequires:	gcc-c++
-BuildRequires:	libXi-devel
-BuildRequires:	pth-devel
-
-Requires:		tqt3 >= 3.4.0
-
-%description
-Trinity QT Interface
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-Requires:	tqt3-devel >= 3.4.0
-
-%description devel
-Development files for %{name}
-
-%prep
-%setup -q -n dependencies/%{name}
-
-%build
-%__mkdir build
-cd build
-%cmake \
-  -DQT_VERSION=3 \
-  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
-  -DMOC_EXECUTABLE=/usr/bin/moc-tqt3 \
-  -DUIC_EXECUTABLE=/usr/bin/uic-tqt3 \
-  ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
-
-# RHEL 5: add newline at end of include files to avoid warnings
-%if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{_includedir}/tqt/*.h; do
-  echo "" >>${i}
-done
-%endif
-
-# Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
-for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
-done
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%{_bindir}/*
-%{_libdir}/*.so.*
-
-%files devel
-%{_includedir}/tqt/
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/pkgconfig/*.pc
-%{cmake_modules_dir}/*.cmake
-
-
-%changelog
-* Tue Feb 14 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'