Hello community, here is the log from the commit of package dasher for openSUSE:Factory checked in at Thu Jun 3 17:41:00 CEST 2010. -------- --- GNOME/dasher/dasher.changes 2010-03-23 15:43:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/dasher/dasher.changes 2010-05-31 16:13:48.000000000 +0200 @@ -1,0 +2,10 @@ +Sat May 29 03:14:05 CEST 2010 - vuntz@opensuse.org + +- Create data-recommended and data-extras subpackages and move + alphabets files there, to make the main package smaller. Those + packages also provide specific locales for dasher. +- Add dasher-data-lang.sh script and locale-map.txt map file to + determine which file should go in which package. +- Add Recommends on data-recommended and Suggests on data-extras. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- dasher-data-lang.sh dasher.spec.in locale-map.txt pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dasher.spec ++++++ --- /var/tmp/diff_new_pack.0baZHJ/_old 2010-06-03 17:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.0baZHJ/_new 2010-06-03 17:40:39.000000000 +0200 @@ -19,12 +19,14 @@ Name: dasher Version: 4.11 -Release: 2 +Release: 3 License: GPLv2+ Summary: Zooming Predictive Text Entry System Url: http://www.inference.phy.cam.ac.uk/dasher/ Group: System/GUI/GNOME -Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2 +Source1: dasher-data-lang.sh +Source2: locale-map.txt BuildRequires: at-spi-devel BuildRequires: cairo-devel BuildRequires: fdupes @@ -37,6 +39,8 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} +Recommends: %{name}-data-recommended +Suggests: %{name}-data-extras BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -46,10 +50,43 @@ accessibility or PDAs). It is usable with greatly limited amounts of physical input while still allowing high rates of text entry. +%package data-recommended +License: GPLv2+ +Summary: Zooming Predictive Text Entry System -- Data files for common languages +Group: System/GUI/GNOME +Requires: %{name} = %{version} +Provides: locale(%{name}:de;ru;it;pl;es;pt;fr;nl) +BuildArch: noarch + +%description data-recommended +Dasher is a zooming predictive text entry system, designed for +situations where keyboard input is impractical (for instance: +accessibility or PDAs). It is usable with greatly limited amounts of +physical input while still allowing high rates of text entry. + +This package contains data files to use dasher with common languages. + +%package data-extras +License: GPLv2+ +Summary: Zooming Predictive Text Entry System -- Data files for additional languages +Group: System/GUI/GNOME +Requires: %{name} = %{version} +Provides: locale(%{name}:ada;af;ak;am;ar;as;az;be;bg;bn;br;bs;ca;chr;co;cs;cy;da;dv;ee;el;eo;et;eu;fa;fi;fo;ga;gaa;gez;gl;gu;ha;haw;he;hi;hr;hu;hy;id;ig;is;ja;jp;ka;kk;kn;ko;ku;ky;la;lb;ln;lo;lt;lv;mk;ml;mr;ms;mt;my;ne;no;nr;nso;oc;om;or;pa;ps;rm;rn;ro;sa;se;si;sk;sl;so;sq;sr;ss;st;sv;sw;ta;te;tg;th;ti;tk;tl;tn;tr;ts;uk;ur;uz;ve;vi;xh;yo;zh;zu) +BuildArch: noarch + +%description data-extras +Dasher is a zooming predictive text entry system, designed for +situations where keyboard input is impractical (for instance: +accessibility or PDAs). It is usable with greatly limited amounts of +physical input while still allowing high rates of text entry. + +This package contains data files to use dasher with additional languages. + %lang_package %prep %setup -q translation-update-upstream +cp %{SOURCE2} . %build %configure --with-pic \ @@ -65,7 +102,7 @@ %suse_update_desktop_file -G "Text Entry Tool" %name GNOME %find_lang %{name} %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst +sh %{SOURCE1} "%{buildroot}" "%{_datadir}" %{name}-data-recommended.lst %{name}-data-extras.lst %{name}-excluded.lst %fdupes %{buildroot} %clean @@ -77,7 +114,7 @@ %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%files -f %{name}.schemas_list -f %{name}-excluded.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README %{_bindir}/* @@ -87,6 +124,10 @@ %{_datadir}/icons/hicolor/scalable/apps/dasher.svg %doc %{_mandir}/man?/*.* +%files data-recommended -f %{name}-data-recommended.lst + +%files data-extras -f %{name}-data-extras.lst + %files lang -f %name.lang %changelog ++++++ dasher-data-lang.sh ++++++ #!/bin/sh # Do not edit the list of locales here: they come from pre_checkin.sh DEFAULT_LOCALES="en" RECOMMENDED_LOCALES="de ru it pl es pt fr nl" if test $# -ne 5; then echo "Wrong number of arguments." exit 1 fi buildroot=$1 datadir=$2 recommendedfile=$3 extrasfile=$4 excludedfile=$5 directory=${datadir}/dasher builddirectory=${buildroot}${directory} RESULT= find_locale_for_file() { RESULT= if test $# -ne 2; then echo "Wrong number of arguments in find_locale_for_file." exit 1 fi _file="$1" _fatal_missing=$2 _line=`grep -E "$_file |# *$_file" locale-map.txt` if test "x$_line" = "x"; then if test ! $_fatal_missing; then echo "No locale found for $_file." exit 1 else return fi fi _locale=`echo $_line | grep -v ^# | sed "s;.* ;;g" | sort -u` echo $_locale | grep -q " " if test $? -eq 0; then echo -n "More than one locale found for $_file: " echo $_locale | sed "s;\n;;g" exit 1 fi RESULT=$_locale } add_file_with_locale() { # second argument can be empty if test $# -ne 1 -a $# -ne 2; then echo "Wrong number of arguments in add_file_with_locale." exit 1 fi _file="$1" _locale="$2" # if this file is commented out, then it's not even a locale and we don't # care to have that by default if test "x$_locale" = "x"; then echo "%exclude ${directory}/${_file}" >> $excludedfile echo "${directory}/${_file}" >> $extrasfile continue fi echo "$DEFAULT_LOCALES" | grep -q $_locale if test $? -eq 0; then # It will be list implicitly in the file list of the main package continue fi echo "%exclude ${directory}/${_file}" >> $excludedfile echo "$RECOMMENDED_LOCALES" | grep -q $_locale if test $? -eq 0; then echo "${directory}/${_file}" >> $recommendedfile else echo "${directory}/${_file}" >> $extrasfile fi } echo "%defattr (-, root, root)" > $recommendedfile echo "%defattr (-, root, root)" > $extrasfile for file in ${builddirectory}/training_*; do file=`basename $file` find_locale_for_file $file true add_file_with_locale $file $RESULT done for file in ${builddirectory}/alphabet.*.xml; do # Note: if the file mentions a training file, then the map will be done with # the training file if possible. training=`grep '<train>' $file | sed "s,<train>,,g;s,</train>,,g" | head -n 1` file=`basename $file` find_locale_for_file $training false locale=$RESULT if test "x$locale" = "x"; then find_locale_for_file $file true locale=$RESULT fi add_file_with_locale $file $locale done ++++++ dasher.spec.in ++++++ # # spec file for package dasher (Version 4.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: dasher Version: 4.11 Release: 2 License: GPLv2+ Summary: Zooming Predictive Text Entry System Url: http://www.inference.phy.cam.ac.uk/dasher/ Group: System/GUI/GNOME Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2 Source1: dasher-data-lang.sh Source2: locale-map.txt BuildRequires: at-spi-devel BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-speech-devel BuildRequires: intltool BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Recommends: %{name}-data-recommended Suggests: %{name}-data-extras BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %description Dasher is a zooming predictive text entry system, designed for situations where keyboard input is impractical (for instance: accessibility or PDAs). It is usable with greatly limited amounts of physical input while still allowing high rates of text entry. %package data-recommended License: GPLv2+ Summary: Zooming Predictive Text Entry System -- Data files for common languages Group: System/GUI/GNOME Requires: %{name} = %{version} Provides: locale(%{name}:RECOMMENDED_LOCALES) BuildArch: noarch %description data-recommended Dasher is a zooming predictive text entry system, designed for situations where keyboard input is impractical (for instance: accessibility or PDAs). It is usable with greatly limited amounts of physical input while still allowing high rates of text entry. This package contains data files to use dasher with common languages. %package data-extras License: GPLv2+ Summary: Zooming Predictive Text Entry System -- Data files for additional languages Group: System/GUI/GNOME Requires: %{name} = %{version} Provides: locale(%{name}:EXTRAS_LOCALES) BuildArch: noarch %description data-extras Dasher is a zooming predictive text entry system, designed for situations where keyboard input is impractical (for instance: accessibility or PDAs). It is usable with greatly limited amounts of physical input while still allowing high rates of text entry. This package contains data files to use dasher with additional languages. %lang_package %prep %setup -q translation-update-upstream cp %{SOURCE2} . %build %configure --with-pic \ --with-gnome \ --disable-scrollkeeper make %{?jobs:-j%jobs} %install %makeinstall %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif %suse_update_desktop_file -G "Text Entry Tool" %name GNOME %find_lang %{name} %find_gconf_schemas sh %{SOURCE1} "%{buildroot}" "%{_datadir}" %{name}-data-recommended.lst %{name}-data-extras.lst %{name}-excluded.lst %fdupes %{buildroot} %clean rm -rf %{buildroot} %pre -f %{name}.schemas_pre %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun %files -f %{name}.schemas_list -f %{name}-excluded.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/dasher %{_datadir}/icons/hicolor/48x48/apps/dasher.png %{_datadir}/icons/hicolor/scalable/apps/dasher.svg %doc %{_mandir}/man?/*.* %files data-recommended -f %{name}-data-recommended.lst %files data-extras -f %{name}-data-extras.lst %files lang -f %name.lang %changelog ++++++ locale-map.txt ++++++ # Training files # training_albanian_SQ.txt sq training_basque_ES.txt eu training_bengali_BD.txt bn training_canna_JP.txt ja training_czechC_CS.txt cs training_czech_CS.txt cs training_danish_DK.txt da training_dutch_NL.txt nl training_english_GB.txt en training_englishLC_GB.txt en training_finnish_FI.txt fi training_frenchC_FR.txt fr training_french_FR.txt fr training_german_DE.txt de training_greek_GR.txt el training_hebrew_IL.txt he training_hiragana60_JP.txt ja training_hiragana83_JP.txt ja training_hungarian_HU.txt hu training_italianC_IT.txt it training_italian_IT.txt it training_mongolian_MN.txt ln training_persian_IR.txt fa training_polish_PL.txt pl training_portuguese_BR.txt pt training_portugueseC_BR.txt pt training_russian_RU.txt ru training_spanishC_ES.txt es training_spanish_ES.txt es training_spyDict.txt zh training_swahili_KE.txt sw training_swedish_SE.txt sv training_turkish_TR.txt tr training_welsh_GB.txt cy # Alphabet files # Note: if the file mentions a training file, then the map will be done with # the training file if possible. (This is why some files are missing from the # list below) # alphabet.AfaanOromo.xml om alphabet.Armenian.xml hy alphabet.Assamese.xml as alphabet.Austen.xml en alphabet.Azerbaijani.xml az alphabet.Belarusian.xml be alphabet.Bulgarian.xml bg alphabet.Esperanto.xml eo alphabet.Estonian.xml et alphabet.Filipino.xml tl alphabet.Gujarati.xml gu alphabet.Hawaiian.xml haw alphabet.Hindi.xml hi alphabet.Icelandic.xml is alphabet.Igbo.xml ig alphabet.Indonesian.xml id alphabet.IrishGaelic.xml ga alphabet.Kannada.xml kn alphabet.Katakana.xml jp alphabet.Malay.xml ms alphabet.Malayalam.xml ml alphabet.Marathi.xml mr alphabet.Moldavian.xml ro alphabet.Ndebele.xml nr alphabet.Oriya.xml or alphabet.Punjabi.xml pa alphabet.Romanian.xml ro alphabet.Sami.xml se alphabet.ScotsGaelic.xml ga alphabet.Sepedi.xml nso alphabet.Sesotho.xml st alphabet.Sinhala.xml si alphabet.Slovak.xml sk alphabet.Slovenian.xml sl alphabet.Swati.xml ss alphabet.Tajik.xml tg alphabet.Tamil.xml ta alphabet.Telugu.xml te alphabet.Thai.xml th alphabet.Thai2.xml th alphabet.Tsonga.xml ts alphabet.Tswana.xml tn alphabet.Urdu.xml ur alphabet.Vietnamese.xml vi alphabet.Xhosa.xml xh alphabet.Yoruba.xml yo alphabet.Zulu.xml zu # musical language #alphabet.abc.xml alphabet.adangbe.xml ada alphabet.afrikaans.xml af alphabet.akan.xml ak alphabet.amharic.xml am alphabet.arabic.xml ar alphabet.bopomofo.xml zh alphabet.bosnian.xml bs alphabet.breton.xml br alphabet.catalan.xml ca alphabet.cherokee.xml chr alphabet.chinese.xml zh alphabet.chineseRuby.xml zh alphabet.corsican.xml co alphabet.croatian.xml hr alphabet.czech.xml cs alphabet.ethiopic.xml gez alphabet.ewe.xml ee alphabet.faroese.xml fo alphabet.ga.xml gaa alphabet.galician.xml gl alphabet.georgian.xml ka alphabet.hausa.xml ha # international phonetic alphabet #alphabet.ipa.xml alphabet.kazakh.xml kk alphabet.kirghiz.xml ky alphabet.kirundi.xml rn # klingon #alphabet.klingon.xml alphabet.korean.xml ko alphabet.koreanNested.xml ko alphabet.kurdish.xml ku alphabet.lao.xml lo alphabet.latex.xml en alphabet.latin.xml la alphabet.latvian.xml lv alphabet.lithuanian.xml lt alphabet.luxembourgish.xml lb alphabet.macedonian.xml mk alphabet.maltese.xml mt alphabet.myanmar.xml my alphabet.nepali.xml ne alphabet.norwegian.xml no alphabet.occitan.xml oc # early medieval alphabet #alphabet.ogham.xml alphabet.pashto.xml ps # perl language #alphabet.perl.xml alphabet.pinyin.xml zh alphabet.pinyin2.xml zh alphabet.polish.xml pl alphabet.romansch.xml rm # runic #alphabet.runic.xml alphabet.sanskrit.xml sa alphabet.serbian.xml sr alphabet.somali.xml so alphabet.thaana.xml dv alphabet.tigrinya.xml ti alphabet.turkmen.xml tk alphabet.ukrainian.xml uk alphabet.uzbek.xml uz alphabet.venda.xml ve ++++++ pre_checkin.sh ++++++ #!/bin/sh DEFAULT_LOCALES="en" RECOMMENDED_LOCALES="de ru it pl es pt fr nl" EXTRAS_LOCALES= for locale in `grep -v ^# locale-map.txt | sed "s,.* ,,g" | sort -u`; do echo $DEFAULT_LOCALES $RECOMMENDED_LOCALES | grep -q $locale if test $? -ne 0; then EXTRAS_LOCALES="$EXTRAS_LOCALES $locale" fi done # Update the list of default/recommended locales in the script sed -i "s,^DEFAULT_LOCALES=\".*$,DEFAULT_LOCALES=\"$DEFAULT_LOCALES\",;s,^RECOMMENDED_LOCALES=\".*$,RECOMMENDED_LOCALES=\"$RECOMMENDED_LOCALES\"," dasher-data-lang.sh # Update the Provides locale(dasher:$locale) lines in spec file RECOMMENDED_LOCALES=`echo $RECOMMENDED_LOCALES | sed "s, ,;,g"` EXTRAS_LOCALES=`echo $EXTRAS_LOCALES | sed "s, ,;,g"` sed "s,RECOMMENDED_LOCALES,$RECOMMENDED_LOCALES,;s,EXTRAS_LOCALES,$EXTRAS_LOCALES," dasher.spec.in > dasher.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org