From 703986bfe4270bb901f594b92eebb265d04ad8f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 23:32:41 +0200 Subject: Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15) --- .../dependencies/tqtinterface/tqtinterface-3.5.13.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec') diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 859afa0bd..d1a56fa18 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -27,12 +27,14 @@ Version: %{version} Release: %{release}%{?dist}%{?_variant} License: GPL Summary: Trinity QT Interface +Group: System Environment/Libraries Vendor: Trinity Project URL: http://www.trinitydesktop.org/ Packager: Francois Andriot Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz @@ -45,8 +47,9 @@ BuildRequires: pth-devel Trinity QT Interface %package devel -Requires: %{name} +Group: Development/Libraries Summary: %{name} - Development files +Requires: %{name} = %{version}-%{release} %description devel Development files for %{name} @@ -75,11 +78,18 @@ cd build %install %__rm -rf %{?buildroot} %__mkdir_p %{?buildroot}%{_includedir} -%make_install -C build +%__make install DESTDIR=%{?buildroot} -C build + +# RHEL 5: add newline at end of include files +%if 0%{?rhel} && 0%{?rhel} <= 5 +for i in %{?buildroot}%{_includedir}/*.h; do + echo "" >>${i} +done +%endif # Fix 'tqt.pc': UIC executable is not correct -sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ - -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' +#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ +# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' # Install 'cmake' modules for a specific package (for later use) %__mkdir_p %{?buildroot}%{cmake_modules_dir} -- cgit v1.2.1 From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec') diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index d1a56fa18..6f65fa7bf 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -80,18 +80,14 @@ cd build %__mkdir_p %{?buildroot}%{_includedir} %__make install DESTDIR=%{?buildroot} -C build -# RHEL 5: add newline at end of include files +# RHEL 5: add newline at end of include files to avoid warnings %if 0%{?rhel} && 0%{?rhel} <= 5 for i in %{?buildroot}%{_includedir}/*.h; do echo "" >>${i} done %endif -# Fix 'tqt.pc': UIC executable is not correct -#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ -# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' - -# Install 'cmake' modules for a specific package (for later use) +# 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} @@ -113,6 +109,9 @@ done %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Aug 28 2011 Francois Andriot - 3.5.13-0 - Import to GIT - Built with future TDE version (3.5.13 + cmake + QT3.3.8d) -- cgit v1.2.1