Accepting request 657325 from home:sbrabec:branches:Base:System
- translation-update-upstream.in: Restore time stamp to prevent triggering of aclocal (boo#1118603). * Refresh translation-update-upstream-embedded.patch. - Add a check that prevents build of SLE version for openSUSE. OBS-URL: https://build.opensuse.org/request/show/657325 OBS-URL: https://build.opensuse.org/package/show/Base:System/translation-update-upstream?expand=0&rev=65
This commit is contained in:
parent
7b24771ca3
commit
02c2f81a7f
@ -1,6 +1,6 @@
|
|||||||
--- translation-update-upstream-embedded.sh
|
--- translation-update-upstream-embedded.sh 2018-12-10 22:58:17.369805285 +0100
|
||||||
+++ translation-update-upstream-embedded.sh
|
+++ translation-update-upstream-embedded.sh 2018-12-10 23:01:32.309607787 +0100
|
||||||
@@ -58,6 +58,7 @@
|
@@ -74,6 +74,7 @@
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -8,7 +8,7 @@
|
|||||||
DIR=${1:-po}
|
DIR=${1:-po}
|
||||||
|
|
||||||
if test -z "$3" ; then
|
if test -z "$3" ; then
|
||||||
@@ -185,7 +186,7 @@
|
@@ -202,7 +203,7 @@
|
||||||
echo "WARNING: Missing $DOMAIN in translation-update-upstream configuration! No updates available."
|
echo "WARNING: Missing $DOMAIN in translation-update-upstream configuration! No updates available."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 10 22:58:25 CET 2018 - sbrabec@suse.com
|
||||||
|
|
||||||
|
- translation-update-upstream.in: Restore time stamp to prevent
|
||||||
|
triggering of aclocal (boo#1118603).
|
||||||
|
* Refresh translation-update-upstream-embedded.patch.
|
||||||
|
- Add a check that prevents build of SLE version for openSUSE.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 28 23:31:49 CET 2018 - sbrabec@suse.com
|
Wed Nov 28 23:31:49 CET 2018 - sbrabec@suse.com
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ fi
|
|||||||
function linguas_update {
|
function linguas_update {
|
||||||
if test -f LINGUAS -o -f ../po/LINGUAS ; then
|
if test -f LINGUAS -o -f ../po/LINGUAS ; then
|
||||||
if test -f LINGUAS ; then
|
if test -f LINGUAS ; then
|
||||||
|
touch -r LINGUAS translation-update-upstream-tmp-stamp
|
||||||
if sed '/^#/d' <LINGUAS | grep -q '[a-zA-Z0-9] [a-z]' ; then
|
if sed '/^#/d' <LINGUAS | grep -q '[a-zA-Z0-9] [a-z]' ; then
|
||||||
echo "Adding $LNG to LINGUAS in to a list in single-line list mode."
|
echo "Adding $LNG to LINGUAS in to a list in single-line list mode."
|
||||||
sed -i "s/^[^#].* [a-z].*\$/& $LNG/" LINGUAS
|
sed -i "s/^[^#].* [a-z].*\$/& $LNG/" LINGUAS
|
||||||
@ -19,6 +20,8 @@ function linguas_update {
|
|||||||
echo "Adding $LNG to LINGUAS."
|
echo "Adding $LNG to LINGUAS."
|
||||||
echo $LNG >>LINGUAS
|
echo $LNG >>LINGUAS
|
||||||
fi
|
fi
|
||||||
|
touch -r translation-update-upstream-tmp-stamp LINGUAS
|
||||||
|
rm translation-update-upstream-tmp-stamp
|
||||||
else
|
else
|
||||||
echo "Not adding $LNG to LINGUAS - secondary domain, global LINGUAS."
|
echo "Not adding $LNG to LINGUAS - secondary domain, global LINGUAS."
|
||||||
fi
|
fi
|
||||||
@ -26,19 +29,28 @@ function linguas_update {
|
|||||||
if test -f $OLDPWD/configure.ac ; then
|
if test -f $OLDPWD/configure.ac ; then
|
||||||
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.ac ; then
|
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.ac ; then
|
||||||
echo "Adding $LNG to configure.ac."
|
echo "Adding $LNG to configure.ac."
|
||||||
|
touch -r $OLDPWD/configure.ac translation-update-upstream-tmp-stamp
|
||||||
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.ac
|
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.ac
|
||||||
|
touch -r translation-update-upstream-tmp-stamp $OLDPWD/configure.ac
|
||||||
|
rm translation-update-upstream-tmp-stamp
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test -f $OLDPWD/configure.in ; then
|
if test -f $OLDPWD/configure.in ; then
|
||||||
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.in ; then
|
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure.in ; then
|
||||||
echo "Adding $LNG to configure.in."
|
echo "Adding $LNG to configure.in."
|
||||||
|
touch -r $OLDPWD/configure.in translation-update-upstream-tmp-stamp
|
||||||
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.in
|
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure.in
|
||||||
|
touch -r translation-update-upstream-tmp-stamp $OLDPWD/configure.in
|
||||||
|
rm translation-update-upstream-tmp-stamp
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test -f $OLDPWD/configure ; then
|
if test -f $OLDPWD/configure ; then
|
||||||
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure ; then
|
if grep -q 'ALL_LINGUAS=' $OLDPWD/configure ; then
|
||||||
echo "Adding $LNG to configure."
|
echo "Adding $LNG to configure."
|
||||||
|
touch -r $OLDPWD/configure translation-update-upstream-tmp-stamp
|
||||||
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure
|
sed -i 's/ALL_LINGUAS="/&'$LNG' /;s/\(ALL_LINGUAS=\)\([^"]\|$\)/\1"'$LNG' "\2/' $OLDPWD/configure
|
||||||
|
touch -r translation-update-upstream-tmp-stamp $OLDPWD/configure
|
||||||
|
rm translation-update-upstream-tmp-stamp
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user