diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-09-29 15:25:38 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-09-29 15:25:38 +0200 |
| commit | 5a9a4b4ed81a6c559abe369987aaf140afcfc9d3 (patch) | |
| tree | 79f2eb85ea9972e9afedb76bb6f5c999e7aee134 | |
| parent | b4b507c636506960fb306de332ec30be399758dc (diff) | |
| download | tde-packaging-5a9a4b4ed81a6c559abe369987aaf140afcfc9d3.tar.gz tde-packaging-5a9a4b4ed81a6c559abe369987aaf140afcfc9d3.zip | |
RPM packaging: update tqt3
| -rw-r--r-- | redhat/Makefile.r14 | 4 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 6 | ||||
| -rw-r--r-- | redhat/packages.el6 | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 4c24c2aca..a3c2bb5d0 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -97,7 +97,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase poppler cmake $(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) tdemultimedia: tdebase akode @@ -140,7 +140,7 @@ endif cmake: # Build on CentOS only ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/cmake) +# $(call buildpkg,3rdparty/cmake) endif esound: diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 3b1b8a34d..73ccb37fc 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -22,9 +22,6 @@ Prefix: %{tde_prefix} 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: libmng-devel BuildRequires: glibc-devel @@ -478,9 +475,6 @@ for the TQt 3 toolkit. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ diff --git a/redhat/packages.el6 b/redhat/packages.el6 index 97b938e90..6d55e8cdb 100644 --- a/redhat/packages.el6 +++ b/redhat/packages.el6 @@ -80,6 +80,7 @@ libXaw-devel libXcomposite-devel libXdamage-devel libXdmcp-devel +libXScrnSaver-devel libXtst-devel libXv-devel libXxf86dga-devel |