Branch: master

f6e9b2b9 2015-12-31 13:52:20 François Andriot
RPM packaging: update build scripts
M redhat/Makefile.r14
M redhat/build/get_spec_version.sh
M redhat/build/is_latest_package_installed.sh
M redhat/buildenv.sh
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 3876bdd..3519708 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PACKAGING_DIR := $(shell cd ..; pwd)
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := 14.0.2
+TDE_VERSION := 14.0.3
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh
index 0980fd2..fc3b1e0 100755
--- a/redhat/build/get_spec_version.sh
+++ b/redhat/build/get_spec_version.sh
@@ -12,6 +12,7 @@
 VERSION=$(sed -n "/^Version:/ s/Version:[ 	]*//p" ${SPECFILE})
 RELEASE=$(sed -n "/^Release:/ s/Release:[ 	]*//p" ${SPECFILE})
 VERSION=$(rpm -E "${VERSION}")
+VERSION=$(rpm --define "tde_version ${TDE_VERSION}" -E "${VERSION}")
 RELEASE=$(rpm --define "tde_version ${TDE_VERSION}" -E "${RELEASE}")
 RELEASE=${RELEASE%$(rpmdist.sh --dist)}
 
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index ab04bd8..7923eca 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -8,8 +8,9 @@
 SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION})
 
 # Package containing "~" (e.g. R14 preversion tarballs):
-if [ "${INSTALLED/\~/}" != "${INSTALLED}" ]; then
-  if [ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then
+if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then
+  # Only compare the part after '~'
+  if [ "${INSTALLED##*_}" = "${TARBALL#*\~}" ] ||[ "${INSTALLED#*\~}" = "${TARBALL#*\~}" ]; then
     echo "Latest package '${PKGNAME}' version '${TARBALL}' is already built and installed."
     exit 0
   fi
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 705d479..1c36bcf 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -3,7 +3,7 @@
 # This file can be sourced in your .bashrc
 
 TDE_BASEDIR=~/tde
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.2"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.3"
 TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14
 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
de586bb8 2015-12-31 13:52:40 François Andriot
RPM packaging: fix screensaver detection in tdeartwork
M redhat/main/tdeartwork/tdeartwork-14.0.0.spec
diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
index 1da50dc..c7f7a48 100644
--- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/main/tdeartwork/tdeartwork-14.0.0.spec
@@ -521,6 +521,8 @@
 %{tde_datadir}/applnk/System/ScreenSavers/worm.desktop
 %endif
 
+%endif
+
 ##########
 
 %if 0%{?with_webcollage}
@@ -578,184 +580,97 @@
 
 %files -n trinity-tdescreensaver-xsavers-extra
 %defattr(-,root,root,-)
-%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop
-%if 0%{?rhel} != 7
-%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/*.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/braid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/deco.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/distort.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/engine.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/queens.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop
+%exclude %{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
 %endif
-%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop
-%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop
 ** Diff limit reached (max: 250 lines) **
05215592 2015-12-31 14:42:40 François Andriot
RPM packaging: fix tdebindings build on opensuse tumbleweed
M redhat/main/tdebindings/tdebindings-14.0.0.spec
 ** Diff limit reached (max: 250 lines) **