Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Sat Jun 20 04:28:41 CEST 2009. -------- --- bundle-lang-common/bundle-lang-common.changes 2009-06-02 10:20:51.000000000 +0200 +++ bundle-lang-common/bundle-lang-common.changes 2009-06-18 18:55:25.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 18 18:55:08 CEST 2009 - coolo@novell.com + +- adapt packages.txt + +------------------------------------------------------------------- +Thu Jun 18 18:52:13 CEST 2009 - coolo@novell.com + +- generate good summaries and descriptions +- leave out the kitchensync package, we only take the taken + languages + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-gnome-extras.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 New: ---- texts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 686 lines (skipped) ++++ between bundle-lang-common/bundle-lang-common.spec ++++ and bundle-lang-common/bundle-lang-common.spec ++++++ bundle-lang-gnome-extras.spec ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -22,10 +22,10 @@ Name: bundle-lang-gnome-extras BuildRequires: accerciser-lang alacarte-lang anjuta-lang aqbanking-lang bombermaze-lang conduit-lang conglomerate-lang contact-lookup-applet-lang dasher-lang deskbar-applet-lang devhelp-lang dia-lang eiciel-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-webcal-lang gDesklets-lang gaim-galago-lang gdl-lang ghex-lang glade3-lang gnome-blog-lang gnome-commander-lang gnome-doc-utils-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-presence-applet-lang gnome-reset-lang gnome-user-share-lang gnomeicu-lang gnopernicus-lang gnucash-lang gnumeric-lang gobby-lang goffice-lang gok-lang goobox-lang goocanvas-lang gqview-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-ugly-lang gthumb-lang hamster-applet-lang inkscape-lang istanbul-lang libgalago-gtk-lang libgalago-lang libgda3-lang libgnomedb-lang libgnomedb3-lang libiptcdata-lang memprof-lang mergeant-lang nautilus-search-tool-lang nemiver-lang net6-lang obby-lang pessulus-lang planner-lang rhythmbox-lang sabayon-lang seahorse-lang seahorse-plugins-lang sound-juicer-lang swfdec-gnome-lang transmission-lang tsclient-lang vinagre-lang xchat-gnome-lang xdg-user-dirs-gtk-lang BuildRequires: fdupes -License: X11/MIT +License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 4 +Release: 5 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -34,12 +34,10 @@ Source2: packages.txt %description -This package groups translations for many GNOME programs. - - +Translations for many GNOME programs %package en -License: X11/MIT +License: MIT License (or similar) Summary: English translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -188,10 +186,8 @@ %description en This package groups English translations for many GNOME programs. - - %package de -License: X11/MIT +License: MIT License (or similar) Summary: German translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -340,10 +336,8 @@ %description de This package groups German translations for many GNOME programs. - - %package es -License: GPL v2 or later +License: MIT License (or similar) Summary: Spanish translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -492,10 +486,8 @@ %description es This package groups Spanish translations for many GNOME programs. - - %package it -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -644,10 +636,8 @@ %description it This package groups translations for many GNOME programs. - - %package fr -License: GPL v2 or later +License: MIT License (or similar) Summary: French translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -796,10 +786,8 @@ %description fr This package groups French translations for many GNOME programs. - - %package ja -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -948,10 +936,8 @@ %description ja This package groups translations for many GNOME programs. - - %package zh -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1100,10 +1086,8 @@ %description zh This package groups translations for many GNOME programs. - - %package nl -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1252,10 +1236,8 @@ %description nl This package groups translations for many GNOME programs. - - %package cs -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1404,10 +1386,8 @@ %description cs This package groups translations for many GNOME programs. - - %package pt -License: GPL v2 or later +License: MIT License (or similar) Summary: Portuguese translations for a many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1627,10 +1607,8 @@ %description pt This package groups Portuguese translations for many GNOME programs. - - %package pl -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1779,10 +1757,8 @@ %description pl This package groups translations for many GNOME programs. - - %package ca -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -1931,10 +1907,8 @@ %description ca This package groups translations for many GNOME programs. - - %package ar -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2083,10 +2057,8 @@ %description ar This package groups translations for many GNOME programs. - - %package hu -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2235,10 +2207,8 @@ %description hu This package groups translations for many GNOME programs. - - %package ko -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2387,10 +2357,8 @@ %description ko This package groups translations for many GNOME programs. - - %package da -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2539,10 +2507,8 @@ %description da This package groups translations for many GNOME programs. - - %package sv -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2691,10 +2657,8 @@ %description sv This package groups translations for many GNOME programs. - - %package ru -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2843,10 +2807,8 @@ %description ru This package groups translations for many GNOME programs. - - %package fi -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -2995,10 +2957,8 @@ %description fi This package groups translations for many GNOME programs. - - %package nb -License: X11/MIT +License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization Provides: accerciser-lang = %(rpm -q --queryformat '%{VERSION}' accerciser-lang) @@ -3148,7 +3108,6 @@ This package groups translations for many GNOME programs. - %prep %build @@ -3157,9 +3116,6 @@ mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . bash %SOURCE0 accerciser-lang alacarte-lang anjuta-lang aqbanking-lang bombermaze-lang conduit-lang conglomerate-lang contact-lookup-applet-lang dasher-lang deskbar-applet-lang devhelp-lang dia-lang eiciel-lang epiphany-extensions-lang epiphany-lang evolution-exchange-lang evolution-webcal-lang gDesklets-lang gaim-galago-lang gdl-lang ghex-lang glade3-lang gnome-blog-lang gnome-commander-lang gnome-doc-utils-lang gnome-netstatus-lang gnome-pilot-conduits-lang gnome-presence-applet-lang gnome-reset-lang gnome-user-share-lang gnomeicu-lang gnopernicus-lang gnucash-lang gnumeric-lang gobby-lang goffice-lang gok-lang goobox-lang goocanvas-lang gqview-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-ugly-lang gthumb-lang hamster-applet-lang inkscape-lang istanbul-lang libgalago-gtk-lang libgalago-lang libgda3-lang libgnomedb-lang libgnomedb3-lang libiptcdata-lang memprof-lang mergeant-lang nautilus-search-tool-lang nemiver-lang net6-lang obby-lang pessulus-lang planner-lang rhythmbox-lang sabayon-lang seahorse-lang seahorse-plugins-lang sound-juicer-lang swfdec-gnome-lang transmission-lang tsclient-lang vinagre-lang xchat-gnome-lang xdg-user-dirs-gtk-lang -for i in $RPM_BUILD_ROOT/*; do - %fdupes $i -done if test gnome-extras = kde-old; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/opt/kde3/share/doc-bundle/HTML && ls -1d *` @@ -3180,17 +3136,28 @@ done fi taken_languages="en de es it fr ja zh nl cs pt pl ca ar hu ko da sv ru fi nb" +for suffix in CN TW; do + cat filelist.zh_$suffix >> filelist.zh + rm -f filelist.zh_$suffix +done for lang in $taken_languages; do echo "%defattr(-,root,root,755)" > taken.$lang cat filelist.$lang >> taken.$lang rm filelist.$lang done -echo "%defattr(-,root,root,755)" > restfiles +# special hack for a special problem (I hope) +if test -f $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png; then + rm $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png + cp $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png +fi for file in filelist.*; do - cat $file >> restfiles + grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read file; do rm -v $RPM_BUILD_ROOT$file; done rm $file done -for file in taken.* restfiles; do +for i in $RPM_BUILD_ROOT/*; do + %fdupes $i +done +for file in taken.*; do changed=1 while test "$changed" = 1; do changed=0 @@ -3207,8 +3174,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f restfiles - %files en -f taken.en %files de -f taken.de @@ -3251,6 +3216,12 @@ #LANGUAGE_FILES %changelog +* Thu Jun 18 2009 coolo@novell.com +- adapt packages.txt +* Thu Jun 18 2009 coolo@novell.com +- generate good summaries and descriptions +- leave out the kitchensync package, we only take the taken + languages * Tue Jun 02 2009 coolo@suse.de - remove gpod-lang for now * Fri May 22 2009 vuntz@novell.com ++++++ bundle-lang-gnome.spec ++++++ ++++ 684 lines (skipped) ++++ between bundle-lang-common/bundle-lang-gnome.spec ++++ and bundle-lang-common/bundle-lang-gnome.spec bundle-lang-kde.spec: same change ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -19,10 +19,10 @@ Name: bundle-lang-other -License: X11/MIT +License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 5 +Release: 6 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ bundle-lang.spec.in ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Localization Version: 11.2 Release: 1 -Summary: Summary +Summary: @SUMMARY@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Source0: bundle.sh @@ -34,6 +34,8 @@ Source2: packages.txt %description +# it's only the src.rpm having this description +@SUMMARY@ #LANGUAGES @@ -46,10 +48,6 @@ cp %SOURCE1 . bash %SOURCE0 @PACKAGES@ -for i in $RPM_BUILD_ROOT/*; do - %fdupes $i -done - if test @SPEC@ = kde-old; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/opt/kde3/share/doc-bundle/HTML && ls -1d *` @@ -70,18 +68,31 @@ done fi taken_languages="@TAKEN_LANGUAGES@" +for suffix in CN TW; do + cat filelist.zh_$suffix >> filelist.zh + rm -f filelist.zh_$suffix +done for lang in $taken_languages; do echo "%defattr(-,root,root,755)" > taken.$lang cat filelist.$lang >> taken.$lang rm filelist.$lang done -echo "%defattr(-,root,root,755)" > restfiles +# special hack for a special problem (I hope) +if test -f $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png; then + rm $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png + cp $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png +fi + for file in filelist.*; do - cat $file >> restfiles + grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read file; do rm -v $RPM_BUILD_ROOT$file; done rm $file done -for file in taken.* restfiles; do +for i in $RPM_BUILD_ROOT/*; do + %fdupes $i +done + +for file in taken.*; do changed=1 while test "$changed" = 1; do changed=0 @@ -98,8 +109,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f restfiles - #LANGUAGE_FILES %changelog ++++++ list_langs.sh ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -1,3 +1,3 @@ langs="af ar az be bg bn br bs ca cs da de el en_GB eo es et eu fa fi fr fy ga gl gu he hi hr hu is it" langs="$langs ja ko km lo lt lv mk mn ms mt nb nds nl nn nso pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn sv" -langs="$langs ta tg th tr tt uk uz vi ven wa xh zh_CN zh_TW zu cy en_US id ka mr en" +langs="$langs ta tg th tr tt uk uz vi ven wa xh zh_CN zh_TW zu cy en_US id ka mr en zh" ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -3,12 +3,14 @@ PolicyKit-kde-lang kde accerciser-lang gnome-extras alacarte-lang gnome-extras +amarok-lang kde anjuta-lang gnome-extras aqbanking-lang gnome-extras at-spi-lang gnome atk-lang common avahi-lang common banshee-1-lang gnome +bash-lang common beagle-lang gnome bluez-gnome-lang gnome bombermaze-lang gnome-extras @@ -106,7 +108,7 @@ gsynaptics-lang gnome gthumb-lang gnome-extras gtk-lang gnome -gtk2-engines-lang gnome +gtk2-engines-lang common gtk2-lang common gtkhtml2-lang gnome gtksourceview-lang gnome @@ -119,6 +121,7 @@ kde4-konqueror-plugins-lang kde kdebase4-openSUSE-lang kde kipi-plugins-lang kde +konversation-lang kde ktorrent-lang kde libbonobo-lang common libbonoboui-lang gnome @@ -127,6 +130,7 @@ libgalago-lang gnome-extras libgda-lang gnome libgda3-lang gnome-extras +libgdata-lang gnome libgnome-lang common libgnomecanvas-lang gnome libgnomecups-lang gnome @@ -138,6 +142,7 @@ libgnomesu-lang gnome libgnomeui-lang gnome libgphoto2-lang common +libgpod4-lang kde libgtop-lang gnome libgweather-lang gnome libiptcdata-lang gnome-extras ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.H15523/_old 2009-06-20 04:27:57.000000000 +0200 +++ /var/tmp/diff_new_pack.H15523/_new 2009-06-20 04:27:57.000000000 +0200 @@ -22,9 +22,10 @@ sed -n -e '1,/#LANGUAGES/p' bundle-lang.spec.in for lang in $languages; do + sum=`grep ^summary.bundle-lang-$spec-$lang texts | sed -e 's,[^ ]* *,,'` echo "%package $lang" echo "License: X11/MIT" - echo "Summary: Summary" + echo "Summary: $sum" echo "Group: System/Localization" for pack in $packages; do echo "Provides: $pack = %(rpm -q --queryformat '%{VERSION}' $pack)" @@ -40,7 +41,7 @@ done echo "" echo "%description $lang" - echo "$lang" + sed -n -e "/+description.bundle-lang-$spec-$lang/,/-description.bundle-lang-$spec-$lang/p" texts | grep -v description.bundle-lang echo "" done sed -n -e '/#LANGUAGES/,$p' bundle-lang.spec.in @@ -48,6 +49,8 @@ sed="s,@TAKEN_LANGUAGES@,$languages," sed="$sed;s,@PACKAGES@,$packages," sed="$sed;s,@SPEC@,$spec," + sum=`grep "^summary.bundle-lang-$spec " texts | sed -e 's,[^ ]* *,,'` + sed="$sed;s,@SUMMARY@,$sum," for lang in $languages; do sed="$sed;s,#LANGUAGE_FILES,%files $lang -f taken.$lang\n\n#LANGUAGE_FILES," done ++++++ texts ++++++ ++++ 677 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org