9 files changed, 699 insertions, 13 deletions

diff --git a/opensuse/core/qt3/qt3-3.5.13.2.spec b/opensuse/core/qt3/qt3-3.5.13.2.spec
index 4c78ad2f2..a50af8db8 100644
--- a/opensuse/core/qt3/qt3-3.5.13.2.spec
+++ b/opensuse/core/qt3/qt3-3.5.13.2.spec
@@ -79,9 +79,13 @@ BuildRequires:	glu-devel
 %endif
 
 # PNG support
-%if %suse_version > 1220
+%if %suse_version >= 1310
+BuildRequires:  libpng16-compat-devel
+%endif
+%if %suse_version >= 1210 && %suse_version < 1300
 BuildRequires:  libpng15-compat-devel
-%else
+%endif
+%if %suse_version >= 1110 && %suse_version < 1200
 BuildRequires:  libpng14-compat-devel
 %endif
 
diff --git a/redhat/buildall-sru.sh b/redhat/buildall-sru.sh
index b8c66dbca..a1c095e71 100755
--- a/redhat/buildall-sru.sh
+++ b/redhat/buildall-sru.sh
@@ -14,8 +14,9 @@ if [ -x /usr/sbin/urpmi ]; then
   REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
 elif [ -x /usr/bin/zypper ]; then
   PKGMGR="zypper"
-  PKGINST="zypper install -y"
-  PKGDEL="zypper remove -y"
+  PKGINST="sudo zypper install -y"
+  PKGDEL="sudo zypper remove -y"
+  REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo zypper refresh)'
 elif [ -x /usr/bin/yum ]; then
   PKGMGR="yum"
   PKGINST='sudo yum install -y'
@@ -190,7 +191,9 @@ grpiui applications/konversation
 grpiui applications/kopete-otr
 grpiui applications/kpicosim
 grpiui applications/kpilot
+if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then
 grpiui applications/kpowersave
+fi
 grpiui applications/krename
 grpiui applications/krusader
 grpiui applications/ksplash-engine-moodin
@@ -226,9 +229,14 @@ grpiui applications/yakuake
 eval ${PKGINST} trinity-desktop-applications
 
 # Decoration-related stuff are distribution-dependant.
+if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then
 grpiui applications/gtk-qt-engine
 grpiui applications/kgtk-qt3
+fi
 
+eval ${PKGINST} trinity-desktop-all
+
+exit 0
 
 # Build extra packages
 grpiui extras/icons-crystalsvg-updated
@@ -261,4 +269,3 @@ grpiui extras/style-ia-ora
 #grpiui extras/twinkle
 #eval ${PKGINST} trinity-desktop-extras
 
-eval ${PKGINST} trinity-desktop-all
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 250c712eb..787c5bf4a 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -56,7 +56,7 @@ checknew() {
 }
 
 # Update main repository
-export tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/update_all_submodules)'
+alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)'
 
 # Build local repository metadata (Mageia)
 alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index 532354e33..3aaa84439 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -79,8 +79,6 @@ autoreconf --force --install --symlink
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
-
 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
 export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -96,13 +94,19 @@ fi
   \
   --disable-dependency-tracking
 
+# FIXME: bad libtool ??
+%if 0%{?rhel} == 5
+%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%else
 %__make %{?_smp_mflags}
+%endif
 
 
 %install
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
 
+# Unwanted files
 %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
 
 
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index a6df1f0b5..d8d7bd3a3 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -187,7 +187,7 @@ rpmbuild -ba \
 	--define "tde_prefix ${PREFIX:-/opt/trinity}" \
 	--define "version ${VERSION:-3.5.13.2}" \
 	--define "preversion ${PREVERSION}" \
-	${SOURCEDIR}/${SPEC}
+	"${SOURCEDIR}/${SPEC}"
 	echo "RET=$?"
 ) 2>&1 | tee ${LOGFILE}
 eval "$(grep ^RET= ${LOGFILE})"
diff --git a/redhat/packages.fedora b/redhat/packages.fedora
new file mode 100644
index 000000000..37d1c7756
--- /dev/null
+++ b/redhat/packages.fedora
@@ -0,0 +1,188 @@
+alsa-lib-devel
+aspell
+aspell-devel
+audiofile-devel
+autotrace
+avahi-devel
+bind-devel
+binutils-devel
+bison
+boost-devel
+bzip2-devel
+ccrtp-devel
+cdparanoia
+cdparanoia-devel
+chrpath
+clucene-core-devel
+cmake
+commoncpp2-devel
+cppunit-devel
+createrepo
+db4-devel
+djvulibre
+djvulibre-devel
+esound-devel
+exiv2-devel
+ffmpeg-devel
+file-devel
+flac-devel
+flex-static
+fribidi-devel
+gamin-devel
+gettext-devel
+glib-devel
+gmp-devel
+gnokii-devel
+gperf
+gpgme-devel
+gphoto2-devel
+GraphicsMagick-devel
+gsl-devel
+gstreamer-devel
+gstreamer-plugins-base-devel
+gtk2-devel
+gtk+-devel
+guile-devel
+hal-devel
+hspell-devel
+icu
+imake
+jack-audio-connection-kit-devel
+jasper-devel
+java-1.7.0-openjdk-devel
+java-devel
+java-openjdk
+lame-devel
+lcms-devel
+libart_lgpl-devel
+libblkid-devel
+libcdio-devel
+libcdio-paranoia-devel
+libcurl-devel
+libdb4-cxx-devel
+libdvdread-devel
+libfontenc-devel
+libgadu-devel
+libgpod-devel
+libgssapi-devel
+libical-devel
+libidn-devel
+libifp-devel
+libmad-devel
+libmp4v2-devel
+libmpcdec-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libogg-devel
+libotr-devel
+libpaper-devel
+libpqxx-devel
+libraw1394-devel
+librsvg2
+libsamplerate-devel
+libsmbclient-devel
+libsndfile-devel
+libssh2-devel
+libtheora-devel
+libtiff-devel
+libtool
+libtool-ltdl-devel
+libtunepimp-devel
+libudev-devel
+libutempter-devel
+libvisual-devel
+libvorbis-devel
+libwmf-devel
+libwpd-devel
+libXaw-devel
+libXdmcp-devel
+libxkbfile-devel
+libXScrnSaver-devel
+libxslt-devel
+libXtst-devel
+libXxf86dga-devel
+libzrtpcpp-devel
+lm_sensors-devel
+meanwhile-devel
+mftrace
+nas-devel
+neon-devel
+netpbm-progs
+net-snmp-devel
+ocaml(compiler)
+OpenEXR-devel
+openldap-devel
+openslp-devel
+ortp-devel
+pam-devel
+pciutils-devel
+pcre-devel
+perl-devel
+perl(ExtUtils::MakeMaker)
+perl(XML::Parser)
+pilot-link-devel
+poppler-devel
+pth-devel
+pulseaudio-libs-devel
+PyQt-devel
+redhat-rpm-config
+rpm-build
+ruby
+ruby-devel
+sane-backends-devel
+SDL-devel
+sip-devel
+speex-devel
+subversion-devel
+sword-devel
+t1lib-devel
+t1utils
+taglib-devel
+transfig
+udev-devel
+valgrind
+wireless-tools-devel
+wv2-devel
+xine-lib-devel
+xmedcon
+xmedcon-devel
+xmlto
+xorg-x11-font-utils
+xscreensaver
+xscreensaver-extras
+xulrunner-devel
+xz-devel
+recode
+libofx-devel
+opensp-devel
+ImageMagick-devel
+doxygen
+scons
+imlib-devel
+fftw-devel
+dssi-devel
+liblo-devel
+lirc-devel
+dbus-glib-devel
+html2ps
+gcc
+gcc-c++
+cpp
+ccache
+mysql-devel
+postgresql-devel
+libacl-devel
+libv4l-devel
+perl
+cups-devel
+tar
+sqlite-devel
+liblrdf-devel
+unixODBC-devel
+gtk-doc
+librsvg2-tools
+
+libXv-devel
+net-tools
+libcap-devel
diff --git a/redhat/packages.mga b/redhat/packages.mga
new file mode 100644
index 000000000..d4dff78bb
--- /dev/null
+++ b/redhat/packages.mga
@@ -0,0 +1,323 @@
+rpm-build
+ccache
+mysql-devel
+unixODBC-devel
+libpq-devel
+freetype2-devel
+mesaglu-devel
+libsm-devel
+libice-devel
+libx11-devel
+libxcursor-devel
+libxext-devel
+libxft-devel
+libxinerama-devel
+libxmu-devel
+libxrandr-devel
+libxrender-devel
+fontconfig-devel
+bzip2-devel
+libjpeg-devel
+libmng-devel
+pkgconfig(libpng15)
+zlib-devel
+nas-devel
+libiodbc-devel
+glib2-devel
+python-devel
+perl(XML::Parser)
+gtk-doc
+libblkid-devel
+pciutils-devel
+xmlto
+gperf
+libv4l-devel
+expat-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+libusb-devel
+libudev-devel
+cups-devel
+cmake
+libgsf-devel
+pth-devel
+libxi-devel
+audiofile-devel
+gsl-devel
+alsa-lib-devel
+libvorbis-devel
+esound-devel
+libjack-devel
+libmad-devel
+pkgconfig(audiofile)
+gettext-devel
+libcurl-devel
+gtk2-devel
+libxslt-devel
+libart_lgpl-devel
+aspell
+aspell-devel
+gamin-devel
+libutempter-devel
+hspell-devel
+libjasper-devel
+OpenEXR-devel
+libraw1394-devel
+lm_sensors-devel
+hal-devel
+libxscrnsaver1-devel
+lib64xscrnsaver1-devel
+libsmbclient-devel
+imake
+libxkbfile-devel
+libfontenc-devel
+libxtst6-devel
+lib64xtst6-devel
+x11-font-util
+xulrunner-devel
+ruby-devel
+java-openjdk
+java-devel
+java-1.7.0-openjdk-devel
+perl-devel
+libtheora-devel
+taglib-devel
+cdparanoia
+libcdda-devel
+libflac-devel
+lib64flac-devel
+libgstreamer0.10-devel
+lib64gstreamer0.10-devel
+libxxf86dga-devel
+lib64xxf86dga-devel
+libxine-devel
+lib64xine-devel
+gnokii-devel
+gpgme-devel
+flex
+libical-devel
+boost-devel
+rpm-devel
+lilo
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+net-snmp-devel
+libungif-devel
+gphoto2-devel
+libpaper-devel
+libt1lib-devel
+libsane1-devel
+freetype-devel
+libpoppler-devel
+fribidi-devel
+lib64sane1-devel
+lib64poppler-devel
+ocaml
+subversion-devel
+neon-devel
+lib64binutils-devel
+SDL-devel
+db4-devel
+sqlite-devel
+sqlite3-devel
+libgadu-devel
+libiw-devel
+openslp-devel
+valgrind
+libexiv2-devel
+transfig
+djvulibre
+librsvg
+libwmf-devel
+netpbm
+python-sip
+python-qt
+bison
+libtiff-devel
+libifp-devel
+libkarma-devel
+karma-sharp
+libgpod-devel
+libmtp-devel
+libmusicbrainz-devel
+libnjb-devel
+libvisual-devel
+libinotifytools-devel
+libmp4v2-devel
+libclucene-devel
+sword-devel
+libmpcdec-devel
+libsndfile-devel
+libdvdread-devel
+libflac++-devel
+liblame-devel
+libffmpeg-devel
+libgstreamer-plugins-base-devel
+ImageMagick-devel
+doxygen
+GraphicsMagick-devel
+libwpd-devel
+wv2-devel
+recode
+libofx-devel
+libOpenSP5-devel
+docbook-style-xsl
+libotr-devel
+yaz
+lib64yaz-devel
+subversion-devel
+dssi-devel
+liblo-devel
+liblrdf-devel
+lirc-devel
+scons
+subversion-devel
+pilot-link-devel
+libhd-devel
+lib64commoncpp-devel
+ccrtp-devel
+libzrtpcpp-devel
+bind-devel
+libcommoncpp-devel
+unixODBC-devel
+libpq-devel
+mesaglu-devel
+libxmu-devel
+bzip2-devel
+pkgconfig(libpng15)
+nas-devel
+libiodbc-devel
+postgresql9.2-devel
+cups-devel
+cmake 
+pth-devel
+lib64xi-devel
+gsl-devel
+lib64mad-devel
+esound-devel
+libmad-devel
+docbook-dtd412-xml
+docbook-utils
+gettext-devel
+lib64expat1-devel
+libxslt-devel
+aspell
+aspell-devel
+libutempter-devel
+hspell-devel
+lib64jasper-devel
+OpenEXR-devel
+libraw1394-devel
+pam-devel
+libusb-devel
+openldap-devel
+lm_sensors-devel
+libudev-devel
+hal-devel
+lib64xscrnsaver1-devel
+libsmbclient-devel
+imake
+libxkbfile-devel
+libfontenc-devel
+libxtst-devel
+x11-font-util
+gnokii-devel
+gpgme-devel
+libical-devel
+boost-devel
+curl-devel
+gtk2-devel
+lib64curl-devel
+lib64flac-devel
+lib64pulseaudio-devel
+speex-devel
+libtheora-devel
+taglib-devel
+cdparanoia
+libcdda-devel
+lib64gstreamer0.10-devel
+lib64xxf86dga-devel
+lib64xine-devel
+lib64lame-devel
+rpm-devel
+SDL-devel
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+xulrunner-devel
+ruby-devel
+java-openjdk
+java-devel
+java-1.6.0-openjdk-devel
+perl-devel
+ocaml
+libgadu-devel
+lib64iw29-devel
+openslp-devel
+lib64v4l-devel
+subversion-devel
+neon-devel
+lib64binutils-devel
+net-snmp-devel
+libungif-devel
+gphoto2-devel
+lib64paper-devel
+lib64t1lib-devel
+lib64sane1-devel
+freetype-devel
+lib64poppler-devel
+fribidi-devel
+lib64exiv2-devel
+transfig
+djvulibre
+librsvg
+libwmf-devel
+X11-devel
+lib64commoncpp-devel
+readline-devel
+bind-devel
+bison
+doxygen
+libcommoncpp-devel
+ImageMagick-devel
+GraphicsMagick-devel
+libwpd-devel
+wv2-devel
+libmpcdec-devel
+libmusicbrainz-devel
+lib64dvdread-devel
+lib64flac++-devel
+lib64ffmpeg-devel
+chrpath
+yaz
+libyaz-devel
+pilot-link-devel
+fftw-devel
+dssi-devel
+liblo-devel
+liblrdf-devel
+lirc-devel
+libotr3-devel
+scons
+libifp-devel
+libkarma-devel
+karma-sharp
+libgpod-devel
+libmtp-devel
+libnjb-devel
+libvisual-devel
+libtunepimp-devel
+lib64inotifytools-devel
+libmp4v2-devel
+lib64twolame-devel
+docbook-style-xsl
+recode
+libofx-devel
+lib64OpenSP5-devel
+lib64clucene-devel
+sword-devel
+drakconf
+imlib1-devel
diff --git a/redhat/packages.oss b/redhat/packages.oss
new file mode 100644
index 000000000..f2e79c52e
--- /dev/null
+++ b/redhat/packages.oss
@@ -0,0 +1,156 @@
+mysql-devel
+postgresql-devel
+unixODBC-devel
+mesa-libGL-devel
+mesa-libGLU-devel
+udev-devel
+gnokii-devel
+gpgme-devel
+flex
+libical-devel
+libtheora-devel
+taglib-devel
+cdparanoia
+cdparanoia-devel
+flac-devel
+gstreamer-0_10-devel
+libxine-devel
+pulseaudio-devel
+libsamplerate-devel
+xscreensaver
+xscreensaver-data
+SDL-devel
+libdb-4_8-devel
+subversion-devel
+neon-devel
+binutils-devel
+ocaml
+libungif-devel
+libgphoto2-devel
+t1lib-devel
+sane-backends-devel
+poppler-devel
+fribidi-devel
+libgpod-devel
+libmtp-devel
+libmusicbrainz-devel 
+libnjb-devel
+libvisual-devel
+libtunepimp-devel
+libmp4v2-devel
+clucene-core-devel
+sword-devel
+ImageMagick-devel
+doxygen GraphicsMagick
+libpqxx-devel
+libwpd-devel
+wv2-devel
+fftw-devel
+dssi-devel
+liblo-devel
+liblrdf-devel
+libotr2-devel
+libofx-devel
+html2ps
+opensp-devel
+scons
+pilot-link-devel
+libmpcdec-devel
+libdvdread-devel
+libmp3lame-devel
+ffmpeg-devel
+transfig
+djvulibre
+rsvg-view
+librsvg-devel
+libwmf-devel
+libexiv2-devel
+libtwolame-devel
+lirc-devel
+dbus-devel
+libhd-devel
+libcdio-devel
+libcdio-paranoia-devel
+gstreamer-devel
+gstreamer-0_10-plugins-base-devel 
+GraphicsMagick-devel
+c++_compiler
+cups-devel
+libmng-devel
+update-desktop-files
+libpng-devel
+patch
+make
+cmake
+pth-devel
+audiofile-devel
+gsl-devel
+esound-devel
+libtool
+libmad-devel
+gettext-devel
+dbus-1-devel
+avahi-devel
+automake
+gtk2-devel
+libcurl-devel
+libxslt-devel
+libart_lgpl-devel
+libidn-devel
+aspell-devel
+pcre-devel
+libbz2-devel
+utempter-devel
+libjasper-devel
+OpenEXR-devel
+xz-devel
+pam-devel
+libudev-devel
+hal-devel
+libsmbclient-devel
+boost-devel
+mozilla-xulrunner20-devel
+python-devel
+ruby-devel
+ruby
+java-devel
+java-1.6.0-openjdk-devel
+giflib-devel
+sqlite-devel
+gnutls-devel
+libgadu-devel
+libiw-devel
+openslp-devel
+valgrind
+libv4l-devel
+meanwhile-devel
+gmp-devel
+lilo
+bison
+libsndfile-devel
+libotr-devel
+docbook-xsl-stylesheets
+chrpath
+commoncpp2-devel
+libccrtp-devel
+libzrtpcpp-devel
+bind-devel
+file-devel
+libofx-devel
+html2ps
+opensp-devel
+imlib1-devel
+Mesa-devel
+libpng15-compat-devel
+ccache
+dbus-1-glib-devel
+gperf xmlto
+pciutils-devel
+libblkid-devel
+gtk-doc
+createrepo
+libcap-devel
+libtiff-devel
+aspell
+hunspell-devel
+cyrus-sasl-devel
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index 1bc70e518..727c8defd 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -198,12 +198,16 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} || 0%{?fedora}
-%define	cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 Requires:		ca-certificates
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define	cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires:		openssl
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
 %endif
 
@@ -427,7 +431,7 @@ cd build
   -DWITH_SUDO_KDESU_BACKEND=OFF \
   %{?!with_lzma:-DWITH_LZMA=OFF} \
   -DWITH_ASPELL=ON \
-  %{?with_hspell:-DWITH_HSPELL=ON} \
+  %{?!with_hspell:-DWITH_HSPELL=OFF} \
   ..
 
 %__make %{?_smp_mflags} || %__make