RPM packaging: update tqt3

pull/3/head
François Andriot 10 years ago
parent b4b507c636
commit 5a9a4b4ed8

@ -97,7 +97,7 @@ tdegames: tdebase tdemultimedia
tdegraphics: tdebase poppler cmake tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics) $(call buildpkg,tdegraphics)
tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt
$(call buildpkg,tdelibs) $(call buildpkg,tdelibs)
tdemultimedia: tdebase akode tdemultimedia: tdebase akode
@ -140,7 +140,7 @@ endif
cmake: cmake:
# Build on CentOS only # Build on CentOS only
ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/cmake) # $(call buildpkg,3rdparty/cmake)
endif endif
esound: esound:

@ -22,9 +22,6 @@ Prefix: %{tde_prefix}
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [tqt3] Unexplained FTBFS on RHEL5
Patch1: tqt3-14.0.0-rhel5_ftbfs.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libmng-devel BuildRequires: libmng-devel
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -478,9 +475,6 @@ for the TQt 3 toolkit.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 5
%patch1 -p1 -b .ftbfs
%endif
# fix variables in 'qmake.conf' # fix variables in 'qmake.conf'
%__sed -i mkspecs/*/qmake.conf \ %__sed -i mkspecs/*/qmake.conf \

@ -80,6 +80,7 @@ libXaw-devel
libXcomposite-devel libXcomposite-devel
libXdamage-devel libXdamage-devel
libXdmcp-devel libXdmcp-devel
libXScrnSaver-devel
libXtst-devel libXtst-devel
libXv-devel libXv-devel
libXxf86dga-devel libXxf86dga-devel

Loading…
Cancel
Save