From b7599bb268d3ffa122861cae56c2639d2787e7d9f6771f6ecf867995ab98089f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Thu, 14 Feb 2013 19:36:41 +0000
Subject: [PATCH] - Improve supplementary script  
 translation-update-upstream-to-translation-update.sh to fit well   for SLE,
 openSUSE and SLE service packs.

OBS-URL: https://build.opensuse.org/package/show/Base:System/translation-update-upstream?expand=0&rev=49
---
 translation-update-upstream-to-translation-update.sh | 8 ++++++--
 translation-update-upstream.changes                  | 7 +++++++
 upstream-collect.conf                                | 6 ++++++
 upstream-collect.sh                                  | 2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/translation-update-upstream-to-translation-update.sh b/translation-update-upstream-to-translation-update.sh
index 527546e..36001d9 100644
--- a/translation-update-upstream-to-translation-update.sh
+++ b/translation-update-upstream-to-translation-update.sh
@@ -45,8 +45,12 @@ cp -a ../../po-mandatory-full po-mandatory
 cp -a ../../po-full po
 cd ../..
 
-osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} ls "${OSC_REPOSITORIES[1]}" >${0%.sh}-rebuilt.lst
-osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} ls "${OSC_REPOSITORIES[0]}" >${0%.sh}-outdated.lst
+osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} ls "${OSC_REPOSITORIES[OSC_MAIN_INDEX]}" >${0%.sh}-rebuilt.lst
+if test -n "$OSC_PROPOSED_INDEX" ; then
+    osc ${OSC_APIURL:+--apiurl=$OSC_APIURL} ls "${OSC_REPOSITORIES[OSC_PROPOSED_INDEX]}" >${0%.sh}-outdated.lst
+else
+    echo -n '' >${0%.sh}-outdated.lst
+fi
 
 SERIAL=0
 for TLST in *.tlst ; do
diff --git a/translation-update-upstream.changes b/translation-update-upstream.changes
index c1277e7..e9a724b 100644
--- a/translation-update-upstream.changes
+++ b/translation-update-upstream.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 14 20:30:28 CET 2013 - sbrabec@suse.cz
+
+- Improve supplementary script
+  translation-update-upstream-to-translation-update.sh to fit well
+  for SLE, openSUSE and SLE service packs.
+
 -------------------------------------------------------------------
 Thu Feb 14 16:51:59 CET 2013 - sbrabec@suse.cz
 
diff --git a/upstream-collect.conf b/upstream-collect.conf
index dafb7e8..26c15db 100644
--- a/upstream-collect.conf
+++ b/upstream-collect.conf
@@ -4,5 +4,11 @@
 # osc repositories with packages (space separated list in parentheses, first takes precedence)
 OSC_REPOSITORIES=( openSUSE:12.3 openSUSE:Factory )
 
+# OSC_REPOSITORIES array index of the main (rebuilt with current translation-update-upstream) repository (starts with 0).
+OSC_MAIN_INDEX=0
+
+# OSC_REPOSITORIES array index of the repository with proposed translation updates that don't appear in the main product (starts with 0). Keep empty if there is no such repository.
+OSC_PROPOSED_INDEX=
+
 # osc server, empty for using of the osc default
 OSC_APIURL=
diff --git a/upstream-collect.sh b/upstream-collect.sh
index 62bc528..0bc3500 100644
--- a/upstream-collect.sh
+++ b/upstream-collect.sh
@@ -100,7 +100,7 @@ esac
 rm -rf UPSTREAM
 mkdir UPSTREAM
 if ! test -d STAMPS ; then
-    mkdir -p pot pot-tuu pot-diff
+    mkdir -p pot pot-tuu pot-diff po-full po-mandatory-full
     mkdir OSC PACKAGES UPDATE STAMPS
     rm -f upstream-collect.log
     rm -f upstream-collect.domain-map.tmp