[tde-packaging][master] 037141d3,f7aa0df3 (merge)

Branch: master

037141d3	2014-09-29 16:57:25	François Andriot
RPM Packaging: update arts
M redhat/dependencies/arts/arts-14.0.0.spec
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 188d7a6..a50a1dc 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -4,6 +4,7 @@ %endif %define tde_version 14.0.0 +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_includedir %{tde_prefix}/include @@ -32,8 +33,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kcmartsrc-pulseaudio -BuildRequires: cmake >= 2.8 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} + +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: glib2-devel
f7aa0df3	2014-09-29 16:57:37	François Andriot
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
M debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff M debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff M debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff M ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff index ebdf463..696f909 100644 --- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -14,7 +14,7 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot if ! test -f $kdepotpath; then - kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot fi diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s\|else\s\|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\$XGETTEXT$/ && / -o/) { s/ -o \$$podir$/ _translatorinfo.cpp -o \$$podir$/ } print $_; } else { print $_; } }' < Makefile.am \| egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0..39dd774 100644 --- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" \|\| echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi Diff limit reached (max: 250 lines)