Branch: master

e6fdd5ab 2016-11-25 14:49:51 François Andriot
RPM packaging: update kpacman build requires
M redhat/extras/kpacman/kpacman-14.0.0.spec
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec
index 541fdb8..64b54ba 100644
--- a/redhat/extras/kpacman/kpacman-14.0.0.spec
+++ b/redhat/extras/kpacman/kpacman-14.0.0.spec
@@ -62,6 +62,8 @@
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
+BuildRequires:	trinity-libtdegames-devel >= %{tde_version}
+
 BuildRequires:	gettext
 
 
389896a8 2016-11-25 14:50:09 François Andriot
RPM packaging: update build script
M redhat/buildenv.sh
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 7505ef9..370b8f1 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -3,8 +3,8 @@
 # This file can be sourced in your .bashrc
 
 TDE_BASEDIR=~/tde
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.3"
-TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.4"
+TDE_GITBASESRC=${TDE_BASEDIR}/tde_master
 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
 
@@ -86,7 +86,7 @@
 alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort'
 
 # Update main repository
-alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)'
+alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_master; ./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)'