RHEL/Fedora/MGA/MDV/Suse: update dependencies for TDE 3.5.13.1

1 files changed, 41 insertions, 84 deletions

diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index 4c39df0cc..fb3f71ace 100644
--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -44,13 +44,8 @@ Patch3: qt-3.1.0-makefile.patch
 Patch4: qt-x11-free-3.3.7-umask.patch
 Patch5: qt-x11-free-3.3.6-strip.patch
 Patch7: qt-x11-free-3.3.2-quiet.patch
-#Patch8: qt-x11-free-3.3.3-qembed.patch
 Patch12: qt-uic-nostdlib.patch
 Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
-#Patch14: qt-x11-free-3.3.3-gl.patch
-#Patch19: qt-3.3.3-gtkstyle.patch 
-#Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch
-#Patch24: qt-x11-free-3.3.5-uic.patch
 Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
@@ -65,24 +60,13 @@ Patch39: qt-x11-free-3.3.7-arm.patch
 Patch40: qt-x11-free-3.3.8b-typo.patch
 
 # immodule patches
-#Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
-#Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-#Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff
 Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
-#Patch100: 0038-dragobject-dont-prefer-unknown.patch
-#Patch101: 0047-fix-kmenu-width.diff
-#Patch102: 0048-qclipboard_hack_80072.patch
-#Patch103: 0056-khotkeys_input_84434.patch
-#patch105: 0073-xinerama-aware-qpopup.patch
-#Patch107: 0079-compositing-types.patch
-#Patch108: 0080-net-wm-sync-request-2.patch
 Patch110: 0084-compositing-properties.patch
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
-#Patch201: qt-x11-free-3.3.8b-gcc43.patch
 
 # TDE 3.5.13 patches
 Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
@@ -127,7 +111,6 @@ BuildRequires: glibc-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: giflib-devel
 BuildRequires: perl
 BuildRequires: sed
 BuildRequires: findutils
@@ -135,6 +118,19 @@ BuildRequires: cups-devel
 BuildRequires: tar
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
+BuildRequires: desktop-file-utils
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
+BuildRequires: unixODBC-devel
+BuildRequires: sqlite-devel
+BuildRequires: gcc-c++
+BuildRequires: make
+
+%if 0%{?rhel} == 4
+BuildRequires: libungif-devel
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: giflib-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libXcursor-devel
@@ -150,13 +146,7 @@ BuildRequires: libXi-devel
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
-BuildRequires: desktop-file-utils
-BuildRequires: mysql-devel
-BuildRequires: postgresql-devel
-BuildRequires: unixODBC-devel
-BuildRequires: sqlite-devel
-BuildRequires: gcc-c++
-BuildRequires: make
+%endif
 
 
 %package config
@@ -175,6 +165,12 @@ Group: Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: freetype-devel
 Requires: fontconfig-devel
+Requires: libpng-devel
+Requires: libjpeg-devel
+Requires: libmng-devel
+%if 0%{?rhel} == 4
+BuildRequires: xorg-x11-devel
+%else
 Requires: libXrender-devel
 Requires: libXrandr-devel
 Requires: libXcursor-devel
@@ -186,11 +182,9 @@ Requires: libSM-devel
 Requires: libICE-devel
 Requires: libXt-devel
 Requires: xorg-x11-proto-devel
-Requires: libpng-devel
-Requires: libjpeg-devel
-Requires: libmng-devel
 Requires: mesa-libGL-devel
 Requires: mesa-libGLU-devel
+%endif
 %if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
 Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -316,13 +310,8 @@ for the Qt 3 toolkit.
 %patch4 -p1 -b .umask
 %patch5 -p1
 %patch7 -p1 -b .quiet
-#patch8 -p1 -b .qembed
 %patch12 -p1 -b .nostdlib
 %patch13 -p1 -b .fonts
-#patch14 -p1 -b .gl
-#patch19 -p1 -b .gtk
-#patch20 -p1 -b .gcc4-buildkey
-#patch24 -p1 -b .uic
 %patch25 -p1 -b .uic-multilib
 %patch27 -p1 -b .fontrendering-ml_IN-bz#209097
 %patch29 -p1 -b .fontrendering-as_IN-bz#209972
@@ -341,25 +330,14 @@ for the Qt 3 toolkit.
 
 # immodule patches
 %if %{immodule}
-#patch50 -p1
-#patch51 -p1 -b .quiet
-#patch52 -p1 -b .fix-key-release-event-with-imm
 %patch53 -p1 -b .resetinputcontext
 %endif
 
 # qt-copy patches
-#patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
-#patch101 -p0 -b .0047-fix-kmenu-width
-#patch102 -p0 -b .0048-qclipboard_hack_80072
-#patch103 -p0 -b .0056-khotkeys_input_84434
-#patch105 -p0 -b .0073-xinerama-aware-qpopup
-#patch107 -p0 -b .0079-compositing-types
-#patch108 -p0 -b .0080-net-wm-sync-request
 %patch110 -p0 -b .0084-compositing-properties
 
 # upstream patches
 %patch200 -p1 -b .fullscreen
-#patch201 -p1 -b .gcc34
 
 # TDE 3.5.13 patches
 %patch300 -p1
@@ -375,6 +353,12 @@ export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
 export PATH="$QTDIR/bin:$PATH"
 export QTDEST=%{qtdir}
 
+# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
+%if 0%{?rhel} == 4
+%__sed -i plugins/src/inputmethods/xim/xim.pro \
+  -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
+%endif
+
 %if %{smp}
    export SMP_MFLAGS="%{?_smp_mflags}"
 %endif
@@ -384,8 +368,13 @@ export QTDEST=%{qtdir}
 %endif
 
 # set correct X11 prefix
-perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
-perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+if [ -d /usr/X11R6 ]; then
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
+else
+  perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
+  perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
+fi
 perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
 perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
 
@@ -441,13 +430,19 @@ echo yes | ./configure \
   -thread \
   -cups \
   -sm \
+%if 0%{?rhel} == 4
+  -no-xinerama \
+  -no-xrandr \
+%else
   -xinerama \
+  -xrandr \
+%endif
   -xrender \
   -xkb \
   -ipv6 \
   -dlopen-opengl \
   -xft \
-  -tablet
+  -tablet -v
 
 make $SMP_MFLAGS src-qmake
 
@@ -618,7 +613,6 @@ rm -rf %{buildroot}
 # QT 3.3.8.D (TDE): removes lots of unnecessary include files
 # (where do they come from ??? They were not in 3.3.8b !)
 %exclude %{qtdir}/include/btree.h
-#%exclude %{qtdir}/include/config.h
 %exclude %{qtdir}/include/crc32.h
 %exclude %{qtdir}/include/debian_qsql_odbc.h
 %exclude %{qtdir}/include/deflate.h
@@ -633,45 +627,12 @@ rm -rf %{buildroot}
 %exclude %{qtdir}/include/inffixed.h
 %exclude %{qtdir}/include/inflate.h
 %exclude %{qtdir}/include/inftrees.h
-%exclude %{qtdir}/include/jchuff.h
-%exclude %{qtdir}/include/jconfig.h
-%exclude %{qtdir}/include/jdct.h
-%exclude %{qtdir}/include/jdhuff.h
-%exclude %{qtdir}/include/jerror.h
-%exclude %{qtdir}/include/jinclude.h
-%exclude %{qtdir}/include/jmemsys.h
-%exclude %{qtdir}/include/jmorecfg.h
-#%exclude %{qtdir}/include/jpegint.h
-#%exclude %{qtdir}/include/jpeglib.h
-%exclude %{qtdir}/include/jversion.h
-#%exclude %{qtdir}/include/libmng.h
-#%exclude %{qtdir}/include/libmng_chunk_io.h
-#%exclude %{qtdir}/include/libmng_chunk_prc.h
-#%exclude %{qtdir}/include/libmng_chunks.h
-#%exclude %{qtdir}/include/libmng_cms.h
-#%exclude %{qtdir}/include/libmng_conf.h
-#%exclude %{qtdir}/include/libmng_data.h
-#%exclude %{qtdir}/include/libmng_display.h
-#%exclude %{qtdir}/include/libmng_dither.h
-#%exclude %{qtdir}/include/libmng_error.h
-#%exclude %{qtdir}/include/libmng_filter.h
-#%exclude %{qtdir}/include/libmng_jpeg.h
-#%exclude %{qtdir}/include/libmng_memory.h
-#%exclude %{qtdir}/include/libmng_object_prc.h
-#%exclude %{qtdir}/include/libmng_objects.h
-#%exclude %{qtdir}/include/libmng_pixels.h
-#%exclude %{qtdir}/include/libmng_read.h
-#%exclude %{qtdir}/include/libmng_trace.h
-#%exclude %{qtdir}/include/libmng_types.h
-#%exclude %{qtdir}/include/libmng_write.h
-#%exclude %{qtdir}/include/libmng_zlib.h
 %exclude %{qtdir}/include/moc_yacc.h
 %exclude %{qtdir}/include/opcodes.h
 %exclude %{qtdir}/include/os.h
 %exclude %{qtdir}/include/otlbuffer.h
 %exclude %{qtdir}/include/pager.h
 %exclude %{qtdir}/include/parse.h
-#%exclude %{qtdir}/include/png.h
 %exclude %{qtdir}/include/pngasmrd.h
 %exclude %{qtdir}/include/pngconf.h
 %exclude %{qtdir}/include/sqlite.h
@@ -679,10 +640,6 @@ rm -rf %{buildroot}
 %exclude %{qtdir}/include/trees.h
 %exclude %{qtdir}/include/vdbe.h
 %exclude %{qtdir}/include/vdbeInt.h
-#%exclude %{qtdir}/include/zconf.h
-#%exclude %{qtdir}/include/zconf.in.h
-#%exclude %{qtdir}/include/zlib.h
-#%exclude %{qtdir}/include/zutil.h
 %exclude %{qtdir}/mkspecs/linux-g++-sparc