From 54824caabcdc2d3180835fe40245bd46f6bfb4e0f49a63ee7e04196b85581921 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Oct 2009 16:18:31 +0000 Subject: [PATCH] Accepting request 23283 from home:sbrabec:branches:openSUSE:Factory Copy from home:sbrabec:branches:openSUSE:Factory/translation-update-upstream based on submit request 23283 from user sbrabec OBS-URL: https://build.opensuse.org/request/show/23283 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/translation-update-upstream?expand=0&rev=5 --- create-tlst-step2-create-gnome_gtp.sh | 26 +++++++++++++++++- translation-update-upstream-20091015.tar.bz2 | 3 --- translation-update-upstream-20091026.tar.bz2 | 3 +++ translation-update-upstream-embedded-README | 17 ++++++++++++ translation-update-upstream-embedded.patch | 19 +++++++++++++ translation-update-upstream.changes | 8 ++++++ translation-update-upstream.spec | 12 ++++++--- upstream-collect.sh | 28 +++++++++++++++----- upstream-gnome-generic.tlst | 2 +- upstream-gnome_gtp.tlst | 27 ++++++++++++++----- 10 files changed, 123 insertions(+), 22 deletions(-) delete mode 100644 translation-update-upstream-20091015.tar.bz2 create mode 100644 translation-update-upstream-20091026.tar.bz2 create mode 100644 translation-update-upstream-embedded-README create mode 100644 translation-update-upstream-embedded.patch diff --git a/create-tlst-step2-create-gnome_gtp.sh b/create-tlst-step2-create-gnome_gtp.sh index c2dd9fb..90a8b29 100644 --- a/create-tlst-step2-create-gnome_gtp.sh +++ b/create-tlst-step2-create-gnome_gtp.sh @@ -17,7 +17,7 @@ osc ${OSC_APIURL:+--apisrv=$OSC_APIURL} list $OSC_REPOSITORY >create-tlst-temp-o # branches tried for all apps: KNOWN_BRANCHES="gnome-2-28" # branches tried apps with the same name base: -APP_BRANCHES="|gimp-2-6" +APP_BRANCHES="|gimp-2-6|gtk-2-18|glib-2-22" # FIXME: support for libgda:release-3-0-branch gnome-background:gnome-2-22 echo "# This file was generated $(LANG=C LC_ALL=C date) by create-tlst-step2-create-gnome_gtp.sh." >upstream-gnome_gtp.tlst @@ -40,6 +40,14 @@ curl http://l10n.gnome.org/POT/ | sed -n 's:^.*href="\([^"]*\)/".*$:\1:p' | sed done done # Packages known to have special name in GTP: + for LBRANCH in $KNOWN_BRANCHES master ; do + echo gconf gconf2 GConf2 $LBRANCH + done + echo glib glib2 glib20 master + echo gtk+ gtk2 gtk20 gtk-2-18 + echo gtk+ gtk2 gtk20 master + echo gtk+ gtk2 gtk20-properties gtk-2-18 + echo gtk+ gtk2 gtk20-properties master echo gnome-phone-manager phonemgr gnome-phone-manager master echo network-manager-applet NetworkManager-gnome nm-applet master # For other versions than sles10: @@ -74,9 +82,25 @@ curl http://l10n.gnome.org/POT/ | sed -n 's:^.*href="\([^"]*\)/".*$:\1:p' | sed gimp20-tips ) PO_DIR=po-tips ;; + gtk20-properties ) + PO_DIR=po-properties + ;; gnumeric-functions ) PO_DIR=po-functions ;; + # FIXME: Only some teams use GTP for gstreamer. Run 'find -name "*-fixes.po"' on processed downstream to find possible regressions. + gst-plugins-base-0.10 ) + PROJECT=gst-plugins-base + ;; + gst-plugins-good-0.10 ) + PROJECT=gst-plugins-good + ;; + gst-plugins-bad-0.10 ) + PROJECT=gst-plugins-bad + ;; + gst-plugins-ugly-0.10 ) + PROJECT=gst-plugins-ugly + ;; * ) PO_DIR=po ;; diff --git a/translation-update-upstream-20091015.tar.bz2 b/translation-update-upstream-20091015.tar.bz2 deleted file mode 100644 index a895ca1..0000000 --- a/translation-update-upstream-20091015.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c062293c6084876f4aa5fa074909012c444333c48b0db8fb415c2a5134cb1818 -size 1550688 diff --git a/translation-update-upstream-20091026.tar.bz2 b/translation-update-upstream-20091026.tar.bz2 new file mode 100644 index 0000000..0735fb6 --- /dev/null +++ b/translation-update-upstream-20091026.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c7f3f4573afeedbd6655c61e3672b9e58782d981cf3c628fdfa8ea7246c0910 +size 1588898 diff --git a/translation-update-upstream-embedded-README b/translation-update-upstream-embedded-README new file mode 100644 index 0000000..8cf8c77 --- /dev/null +++ b/translation-update-upstream-embedded-README @@ -0,0 +1,17 @@ +translation-update-upstream-embedded.sh is a script that can be used +without translation-update-upstream package. + +How to use it: + +1. Create .tlst and .hook files and rin ./upstream-collect.sh as you do +with translation-update-upstream. + +2. Create an archive that contains: + - directory translation-update-upstream with: + - translation-update-upstream-embedded.sh + - msgheadermerge* + - directory po that contains contents of the archive created in step 1. + +3. Instead of call of translation-update-upstream in the spec file use +translation-update-upstream/translation-update-upstream-embedded.sh. +Arguments and style of use are the same. diff --git a/translation-update-upstream-embedded.patch b/translation-update-upstream-embedded.patch new file mode 100644 index 0000000..641e040 --- /dev/null +++ b/translation-update-upstream-embedded.patch @@ -0,0 +1,19 @@ +--- translation-update-upstream-embedded.sh ++++ translation-update-upstream-embedded.sh +@@ -34,6 +34,7 @@ + fi + } + ++BASE_DIR=$PWD + DIR=${1:-po} + DOMAIN=$2 + +@@ -91,7 +92,7 @@ + echo "WARNING: Missing $DOMAIN in translation-update-upstream configuration! No updates available." + fi + else +- echo "ERROR: Package translation-update-upstream is not installed. Please update your BuildRequires!" ++ echo "ERROR: Incorrect use of translation-update-upstream-embedded!" + exit 1 + fi + fi diff --git a/translation-update-upstream.changes b/translation-update-upstream.changes index 4ac083b..198cdce 100644 --- a/translation-update-upstream.changes +++ b/translation-update-upstream.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 27 16:21:20 CET 2009 - sbrabec@suse.cz + +- Added several more packages. +- Fixed errors if one package has updates on more servers. +- Do not interfere with gnome-patch-translation (bnc#517629#c17). +- Added translation-update-upstream-embedded script (src rpm only). + ------------------------------------------------------------------- Fri Oct 9 17:01:19 CEST 2009 - sbrabec@suse.cz diff --git a/translation-update-upstream.spec b/translation-update-upstream.spec index 2c5e1b1..cf92eb0 100644 --- a/translation-update-upstream.spec +++ b/translation-update-upstream.spec @@ -1,5 +1,5 @@ # -# spec file for package translation-update-upstream (Version 20091015) +# spec file for package translation-update-upstream (Version 20091026) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: translation-update-upstream License: GPL v2 or later Group: System/Localization -Version: 20091015 +Version: 20091026 Release: 1 Summary: Tool for Translation Update from Upstream Source: %{name}-%{version}.tar.bz2 @@ -34,6 +34,8 @@ Source6: msgheadermerge Source7: msgheadermerge-compose Source8: msgheadermerge-parse Source9: msgheadermerge-empty.pot +Source10: %{name}-embedded-README +Patch: %{name}-embedded.patch # Files below are package maintainer tools, not used for package build: Source50: upstream-collect.sh Source51: upstream-collect.conf @@ -74,6 +76,11 @@ cp -a %{S:3} COPYING cp -a %{S:4} README cp -a %{S:5} HOWTO cp -a %{S:6} %{S:7} %{S:8} %{S:9} . +cp -a %{S:10} translation-update-upstream-embedded.README +sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' translation-update-upstream +sed 's/@LIBEXECDIR@/\$BASE_DIR/g;s:@DATADIR@/translation-update-upstream:\$BASE_DIR/translation-update-upstream/po:g;s/translation-update-upstream\./translation-update-upstream-embedded./g' translation-update-upstream-embedded.sh +%patch +chmod +x translation-update-upstream-embedded.sh %build @@ -81,7 +88,6 @@ cp -a %{S:6} %{S:7} %{S:8} %{S:9} . mkdir -p $RPM_BUILD_ROOT%{_datadir} $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream cp -a po $RPM_BUILD_ROOT%{_datadir}/%{name} install -d $RPM_BUILD_ROOT%{_bindir} -sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' translation-update-upstream install translation-update-upstream $RPM_BUILD_ROOT%{_bindir}/ install -m0755 msgheadermerge msgheadermerge-compose msgheadermerge-parse $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/ install -m0644 msgheadermerge-empty.pot $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/ diff --git a/upstream-collect.sh b/upstream-collect.sh index b61a231..e7ae585 100644 --- a/upstream-collect.sh +++ b/upstream-collect.sh @@ -67,6 +67,19 @@ else fi EOF chmod +x ~/.upstream-collect.tmp/translation-update-upstream + +# Strings in installed instance of gnome-patch-translation may interfere +# with upstream-collect.sh. Use of dummies allows to import upstream +# strings, that are part of openSUSE patches. +for FILE in gnome-patch-translation-prepare gnome-patch-translation-update ; do + cat >~/.upstream-collect.tmp/$FILE <