Hello community, here is the log from the commit of package bundle-lang checked in at Mon Sep 3 23:11:22 CEST 2007. -------- --- bundle-lang/bundle-lang-common.changes 2007-09-02 17:51:57.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/bundle-lang-common.changes 2007-09-03 17:19:04.236605000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 3 17:18:39 CEST 2007 - coolo@suse.de + +- remove the conflicts with the real -lang packages +- move the files into a bundle directory so they do not create + file conflicts either + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/bundle-lang-other.changes 2007-09-03 12:07:33.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Sep 3 12:07:30 CEST 2007 - stbinner@suse.de + +- initial package + New: ---- bundle-lang-other.changes bundle-lang-other.spec README.other ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ ++++ 1154 lines (skipped) ++++ between bundle-lang/bundle-lang-common.spec ++++ and /mounts/work_src_done/NOARCH/bundle-lang/bundle-lang-common.spec bundle-lang-gnome.spec: same change bundle-lang-kde.spec: same change ++++++ bundle-lang-other.spec ++++++ # # spec file for package bundle-lang-other (Version 10.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: bundle-lang-other License: X11/MIT Group: System/GUI/KDE Version: 10.3 Release: 1 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Provides: locale(aa;af;am;ang;ar;as;az;az_IR;be;be@latin;bg;bn;bn_IN;bo;br;bs;byn;ca;ca@valencia) Provides: locale(csb;cy;dv;dz;ee;el;el_GR;eo;et;et_EE;eu;eu_ES) Provides: locale(fa;fo;fy;ga;gd;gez;gl;gn;gu;gv;haw;he;hi;hr) Provides: locale(hy;ia;id;is;it;it_CH;it_IT;iu;ka;kk;kl;km) Provides: locale(kn;kok;ku;kw;ky;lg;li;lo;lt;lv;mg;mi;mk;ml;mn;mr;ms;mt;my;nds;ne) Provides: locale(nn;nn_NO;nso;oc;om;or;pa;ps;rm;ro) Provides: locale(rw;sa;se;si;sid;sk;sl;sl_SI;so;sp;sq;sq_AL;sr;sr@Latn;sr@ije) Provides: locale(ss;st;sw;syr;ta;te;tg;th;ti;tig;tk;tl;tr;tt;ug;uk;uk_UA;ur;urd;uz;uz@Cyrl) Provides: locale(uz@Latn;ve;ven;vi;wa;wal;wo;xh;yi;yo;zh;zh_CN.GB2312;zu) Source0: README.other %description This package collects translations for languages not covered by one of the bundle-lang-*-* packages. %prep %build %install install -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT%_docdir/%name/README %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %_docdir/%name %changelog * Mon Sep 03 2007 - stbinner@suse.de - initial package ++++++ bundle-lang.spec.in ++++++ --- bundle-lang/bundle-lang.spec.in 2007-08-20 11:12:04.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/bundle-lang.spec.in 2007-09-03 16:29:24.495602000 +0200 @@ -42,8 +42,8 @@ taken_languages="@TAKEN_LANGUAGES@" for lang in $taken_languages; do echo "%defattr(-,root,root,755)" > taken.$lang - cat filelist.$lang filelist.doc.$lang >> taken.$lang - rm filelist.$lang filelist.doc.$lang + cat filelist.$lang >> taken.$lang + rm filelist.$lang done echo "%defattr(-,root,root,755)" > restfiles for file in filelist.*; do ++++++ bundle.sh ++++++ --- bundle-lang/bundle.sh 2007-08-09 15:31:55.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/bundle.sh 2007-09-03 16:32:01.511424000 +0200 @@ -25,7 +25,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/translations for lang in $langs; do : > filelist.$lang - : > filelist.doc.$lang + : > filelist.dirs.$lang done for package in "$@"; do @@ -39,15 +39,43 @@ if test "$flag" = "d"; then echo -n "%doc " >> filelist.$lang fi + nfile=$file + case $file in + */locale/*) + nfile=${file/locale/locale-bundle} + ;; + */doc/*) + nfile=${file/doc/doc-bundle} + ;; + */help/*) + nfile=${file/help/help-bundle} + ;; + esac if test -d "$file"; then - mkdir -p $RPM_BUILD_ROOT$file + mkdir -p $RPM_BUILD_ROOT$nfile echo -n "%dir " >> filelist.$lang else - mkdir -p $RPM_BUILD_ROOT`dirname "$file"` - cp -d --preserve=all -P "$file" $RPM_BUILD_ROOT$file + dir=`dirname "$nfile"` + mkdir -p $RPM_BUILD_ROOT$dir + while true; do + echo "%dir $dir" >> filelist.dirs.$lang + case "$dir" in + *-bundle) + break; + ;; + /) + break; + esac + dir=`dirname "$dir"` + done + cp -d --preserve=all -P "$file" $RPM_BUILD_ROOT$nfile fi - echo "$file" >> filelist.$lang + echo "$nfile" >> filelist.$lang done unset IFS done +for lang in $langs; do + sort -u filelist.dirs.$lang >> filelist.$lang + rm filelist.dirs.$lang +done ++++++ pre_checkin.sh ++++++ --- bundle-lang/pre_checkin.sh 2007-08-20 10:56:03.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/pre_checkin.sh 2007-09-03 16:38:12.837729000 +0200 @@ -1,4 +1,4 @@ -languages="de en es fr pt" +languages="en pt fr es de zh ja ru cs hu pl ko fi da nb sv nl" bundles="kde gnome common" for spec in $bundles; do @@ -16,15 +16,13 @@ case $pack in *-lang) echo "Provides: locale(${pack/-lang/}:$lang)" - echo "Conflicts: $pack-all" - ;; - *-doc) - echo "Conflicts: $pack-all" ;; esac done echo "" echo "%description $lang" + echo "$lang" + echo "" done sed -n -e '/#LANGUAGES/,$p' bundle-lang.spec.in } | { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org