RPM Packaging: update build scripts

8 files changed, 106 insertions, 62 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 2f8826c8c..4c24c2aca 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -139,25 +139,25 @@ endif
 
 cmake:
 # Build on CentOS only
-ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),)
+ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,3rdparty/cmake)
 endif
 
 esound:
-# Build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
+# Build on Mageia and CentOS >= 7
+ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/esound)
 endif
 
 gnuchess:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+# Build on CentOS 5, CentOS 7
+ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/gnuchess)
 endif
 
 htdig:
-# build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
+# build on Mageia, and CentOS >= 7
+ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/htdig)
 endif
 
@@ -178,8 +178,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 libotr3:
-# Build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
+# Build on Mageia, CentOS >= 7
+ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/libotr3)
 endif
 
@@ -190,8 +190,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 lilypond: mftrace
-# Build on CentOS only
-ifneq ($(wildcard /etc/centos-release),)
+# Build on CentOS 6 only
+ifneq ($(wildcard /boot/vmlinuz*.el6*),)
 	$(call buildpkg,3rdparty/lilypond)
 endif
 
@@ -202,8 +202,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 mftrace:
-# Build on CentOS only
-ifneq ($(wildcard /etc/centos-release),)
+# Build on CentOS 6 only
+ifneq ($(wildcard /boot/vmlinuz*.el6*),)
 	$(call buildpkg,3rdparty/mftrace)
 endif
 
@@ -229,8 +229,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 sword:
-# Build on Fedora >= 20 only, or PCLinuxOS
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release),)
+# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
+ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/sword)
 endif
 
@@ -413,8 +413,10 @@ kftpgrabber:	tdebase
 
 kgtk-qt3:	tdebase
 # Do NOT build on CentOS 5 (GTK2 is too old)
+# Do NOT build on CentOS >=7 (GTK2 is too new)
 # Do NOT build on Fedora >= 20 (GTK2 is too new)
-ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.fc20*),)
+# Do NOT build on Mageia >= 4 (GTK2 is too new)
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),)
 	$(call buildpkg,applications/kgtk-qt3)
 endif
 
@@ -472,14 +474,14 @@ koffice:	tdebase wv2
 konversation:	tdebase
 	$(call buildpkg,applications/konversation)
 
-kopete-otr:	tdebase
+kopete-otr:	tdebase libotr3
 	$(call buildpkg,applications/kopete-otr)
 
 kpicosim:	tdebase
 	$(call buildpkg,applications/kpicosim)
 
 kpilot:	tdebase
-# Do NOT build on CentOS 5
+# Do NOT build on CentOS 5 (pilot-link library is too old)
 ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/kpilot)
 endif
@@ -554,8 +556,8 @@ ifeq ($(wildcard /etc/centos-release),)
 endif
 
 rosegarden:	tdebase lilypond
-# Do NOT build on CentOS 5
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
+# Do NOT build on CentOS 5, CentOS 7
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
 	$(call buildpkg,applications/rosegarden)
 endif
 
@@ -596,7 +598,10 @@ tdepowersave:	tdebase
 	$(call buildpkg,applications/tdepowersave)
 
 tderadio:	tdebase
+# Do NOT build on CentOS 7
+ifeq ($(wildcard /boot/vmlinuz*.el7*),)
 	$(call buildpkg,applications/tderadio)
+endif
 
 tde-style-lipstik:	tdebase
 	$(call buildpkg,applications/tde-style-lipstik)
diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru
index c3ad3e7c5..ecce67864 100644
--- a/redhat/Makefile.v3.5.13-sru
+++ b/redhat/Makefile.v3.5.13-sru
@@ -27,22 +27,22 @@ i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 
 ### Trinity Dependencies
-arts:	tqtinterface esound
+arts:	tqtinterface esound cmake
 	$(call buildpkg,dependencies/arts)
 
 avahi-tqt:	tqtinterface
 	$(call buildpkg,dependencies/avahi-tqt)
 
-dbus-1-tqt:	tqtinterface
+dbus-1-tqt:	tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-1-tqt)
 
-dbus-tqt: tqtinterface
+dbus-tqt: tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libcaldav: tqtinterface libcurl
+libcaldav: tqtinterface autoconf libcurl
 	$(call buildpkg,dependencies/libcaldav)
 
-libcarddav:	tqtinterface libcurl
+libcarddav:	tqtinterface autoconf libcurl
 	$(call buildpkg,dependencies/libcarddav)
 	
 tqca:	tqtinterface
@@ -54,7 +54,7 @@ tqca-tls: tqtinterface tqca
 qt3: esound
 	$(call buildpkg,dependencies/qt3)
 
-tqtinterface:	qt3
+tqtinterface:	qt3 cmake
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
@@ -70,7 +70,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs htdig hal
+tdebase:	tdelibs htdig cmake hal
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase
@@ -82,10 +82,10 @@ tdeedu:	tdebase
 tdegames:	tdebase tdemultimedia
 	$(call buildpkg,tdegames)
 
-tdegraphics:	tdebase poppler
+tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	qt3 tqtinterface arts dbus-tqt dbus-1-tqt
+tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -94,10 +94,10 @@ tdemultimedia:	tdebase akode
 tdenetwork:	tdebase
 	$(call buildpkg,tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav
+tdepim:	tdebase libcaldav libcarddav cmake
 	$(call buildpkg,tdepim)
 
-tdesdk:		tdebase tdebindings
+tdesdk:		tdebase tdebindings cmake
 	$(call buildpkg,tdesdk)
 
 tdetoys:	tdebase
@@ -106,13 +106,31 @@ tdetoys:	tdebase
 tdeutils:	tdebase
 	$(call buildpkg,tdeutils)
 
-tdevelop:	tdebase tdesdk
+tdevelop:	tdebase tdesdk cmake
 	$(call buildpkg,tdevelop)
 
 tdewebdev:	tdebase tdesdk
 	$(call buildpkg,tdewebdev)
 
 ### 3rd party libraries and tools
+autoconf: m4
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/autoconf)
+endif
+
+automake:
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/automake)
+endif
+
+cmake:
+# Build on CentOS only
+ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/cmake)
+endif
+
 esound:
 # Build on Mageia and CentOS >= 7
 ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
@@ -153,7 +171,7 @@ endif
 endif
 endif
 
-libcurl:
+libcurl: automake libtool
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/curl)
@@ -165,12 +183,24 @@ ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
 	$(call buildpkg,3rdparty/libotr3)
 endif
 
+libtool: autoconf automake
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/libtool)
+endif
+
 lilypond: mftrace
 # Build on CentOS 6 only
 ifneq ($(wildcard /boot/vmlinuz*.el6*),)
 	$(call buildpkg,3rdparty/lilypond)
 endif
 
+m4:
+# Build on CentOS 5 only (vendor-provided Poppler is too old)
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/m4)
+endif
+
 mftrace:
 # Build on CentOS 6 only
 ifneq ($(wildcard /boot/vmlinuz*.el6*),)
@@ -249,7 +279,7 @@ abakus:	tdebase
 adept:	tdebase
 	$(call buildpkg,applications/adept)
 
-amarok:	tdebase
+amarok:	tdebase cmake
 	$(call buildpkg,applications/amarok)
 
 basket:	tdebase
@@ -520,7 +550,7 @@ k3b-i18n:	tdebase
 koffice-i18n:	tdebase
 	$(call buildpkg,applications/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n:	tdebase cmake
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index c7c5540cb..7af2065ec 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -23,6 +23,6 @@ fi
 VERSION=${VERSION/-*_/\~}
 VERSION=${VERSION%-[0-9]}
 VERSION=${VERSION%.opt}
-VERSION=${VERSION%.*}
+VERSION=${VERSION%.[a-z]*}
 
 echo $VERSION
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index f1e251b65..a361ff7b7 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -11,7 +11,7 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
 
 VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}")
 VERSION=${VERSION%.opt}
-VERSION=${VERSION%.*}
+VERSION=${VERSION%.[a-z]*}
 VERSION=${VERSION/-*_/\~}
 
 
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 1f2216152..51b6dc7c6 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -20,7 +20,11 @@ if [ -x /usr/sbin/urpmi ]; then
 elif [ -x /usr/bin/zypper ]; then
   REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/yum ]; then
-  REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+  if [ "$(rpm -E %dist)" = ".el5" ]; then
+    REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+  else
+    REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+  fi
 elif [ -x /usr/bin/apt-get ]; then
   REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)'
 fi
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 4107440cc..3ed7825e0 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -54,6 +54,27 @@ checknew() {
   done
 }
 
+
+do_optimizegraphics() {
+  if ! (which optipng && which advdef && which pngout) ; then
+    echo "Missing utility ! Check that 'optipng', 'advdef' and 'pngout' utilities are available !"
+    return 1
+  fi
+  
+  while read m; do
+    if [ -d "${m}" ]; then
+      pushd "${m}"
+      if [ -r .optimizegraphics ]; then
+        echo "Graphics are already optimized !"
+      else
+        optimizegraphics
+        touch .optimizegraphics
+      fi
+      popd
+    fi
+  done < submodules
+}
+
 alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"'
 
 # Update main repository
diff --git a/redhat/packages.el7 b/redhat/packages.el7
index ba1ff1fa1..980c35452 100644
--- a/redhat/packages.el7
+++ b/redhat/packages.el7
@@ -15,13 +15,11 @@ bison
 boost-devel
 bzip2-devel
 ccache
-ccrtp-devel
 cdparanoia
 cdparanoia-devel
 chrpath
 clucene-core-devel
 cmake
-commoncpp2-devel
 cpp
 cppunit-devel
 createrepo
@@ -32,7 +30,6 @@ djvulibre
 djvulibre-devel
 doxygen
 emacs
-esound-devel
 exiv2-devel
 ffmpeg-devel
 fftw-devel
@@ -44,11 +41,9 @@ gamin-devel
 gcc
 gcc-c++
 gcc-gfortran
-gcc-java
 gettext-devel
 glib-devel
 gmp-devel
-gnokii-devel
 gperf
 gpgme-devel
 gphoto2-devel
@@ -59,21 +54,17 @@ gtk+-devel
 gtk-doc
 gtk2-devel
 guile-devel
-hal-devel
 hspell-devel
-htdig
 html2ps
 icu
 imake
 imlib-devel
 jack-audio-connection-kit-devel
 jasper-devel
-java-1.4.2-gcj-compat-devel
 java-1.7.0-openjdk-devel
 java-devel
 java-openjdk
 lame-devel
-lcms-devel
 libXScrnSaver-devel
 libXaw-devel
 libXcomposite-devel
@@ -93,16 +84,12 @@ libconfig-devel
 libcurl-devel
 libdvdread-devel
 libfontenc-devel
-libgcj-devel
 libgpod-devel
 libgsf-devel
-libgssapi-devel
 libical-devel
 libidn-devel
-liblo-devel
 libmad-devel
 libmng-devel
-libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
 libmusicbrainz-devel
@@ -128,12 +115,9 @@ libwmf-devel
 libwpd-devel
 libxkbfile-devel
 libxslt-devel
-libzrtpcpp-devel
-lirc-devel
 lm_sensors-devel
 meanwhile-devel
 mysql-devel
-nas-devel
 neon-devel
 net-snmp-devel
 net-tools
@@ -151,7 +135,6 @@ perl
 perl(ExtUtils::MakeMaker)
 perl(XML::Parser)
 perl-devel
-pilot-link-devel
 poppler-devel
 postgresql-devel
 pth-devel
@@ -167,23 +150,16 @@ sip-devel
 speex-devel
 sqlite-devel
 subversion-devel
-sword-devel
 t1lib-devel
 t1utils
 taglib-devel
 tar
 texinfo
-texlive-utils
 transfig
-udisks-devel
 unixODBC-devel
 valgrind
-wireless-tools-devel
-xine-lib-devel
 xmlto
 xorg-x11-font-utils
-xscreensaver
-xscreensaver-extras
 xulrunner-devel
 xz-devel
 libcdio-paranoia-devel
diff --git a/redhat/packages.mga4 b/redhat/packages.mga4
index ba8535406..3684984f7 100644
--- a/redhat/packages.mga4
+++ b/redhat/packages.mga4
@@ -3,6 +3,7 @@ ImageMagick-devel
 NetworkManager-glib-devel
 OpenEXR-devel
 SDL-devel
+advancecomp
 alsa-lib-devel
 aspell
 aspell-devel
@@ -45,11 +46,13 @@ gphoto2-devel
 gsl-devel
 gtk-doc
 gtk2-devel
+gtk+3.0-devel
 hspell-devel
 imake
 java-1.7.0-openjdk
 java-1.7.0-openjdk-devel
 karma-sharp
+kde-dev-scripts
 lcms-devel
 lib64binutils-devel
 lib64clucene-devel
@@ -90,6 +93,7 @@ libblkid-devel
 libcdda-devel
 libclucene-devel
 libcommoncpp-devel
+libconfig-devel
 libcurl-devel
 libdvdread-devel
 libffmpeg-devel
@@ -161,6 +165,7 @@ ocaml
 openldap-devel
 openslp-devel
 opensp-devel
+optipng
 pam-devel
 pciutils-devel
 perl(XML::Parser)
@@ -173,6 +178,7 @@ postgresql9.3-devel
 pth-devel
 python-devel
 python-sip
+qt4-devel
 readline-devel
 recode
 rpm-build
@@ -186,6 +192,8 @@ subversion-devel
 sword-devel
 taglib-devel
 transfig
+udisks-devel
+udisks2-devel
 unixODBC-devel
 valgrind
 wv2-devel