Hello community, here is the log from the commit of package myspell-dictionaries for openSUSE:Factory checked in at 2012-04-12 09:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/myspell-dictionaries (Old) and /work/SRC/openSUSE:Factory/.myspell-dictionaries.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "myspell-dictionaries", Maintainer is "pmladek@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/myspell-dictionaries/myspell-dictionaries.changes 2011-10-05 11:10:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.myspell-dictionaries.new/myspell-dictionaries.changes 2012-04-12 09:42:29.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Apr 3 13:21:48 UTC 2012 - pmladek@suse.com + +- update license to follow spdx.org standard + +------------------------------------------------------------------- +Tue Mar 27 13:55:20 UTC 2012 - elchevive@opensuse.org + +- Update pt_BR dictionary (Vero 2.1), its license, URL and description + +------------------------------------------------------------------- +Wed Feb 8 10:01:55 UTC 2012 - pmladek@suse.com + +- http://extensions.services.openoffice.org was not reliable; removed this URL + from the source tag to pass the commit check; kept the URL just in a comment + +------------------------------------------------------------------- +Thu Jan 26 20:10:24 UTC 2012 - asterios.dramis@gmail.com + +- Updated Greek dictionary to version 20100124 (1.1.0) +- Updated spec file based on spec-cleaner run + +------------------------------------------------------------------- Old: ---- Vero_pt_BR_V207AOC.oxt el_GR.tar.bz2 New: ---- el_gr_v110.oxt vero_pt_br_v210aoc.oxt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ myspell-dictionaries.spec ++++++ ++++ 2988 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/myspell-dictionaries/myspell-dictionaries.spec ++++ and /work/SRC/openSUSE:Factory/.myspell-dictionaries.new/myspell-dictionaries.spec ++++++ myspell-dictionaries-gen-spec ++++++ --- /var/tmp/diff_new_pack.klXSd4/_old 2012-04-12 09:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.klXSd4/_new 2012-04-12 09:42:33.000000000 +0200 @@ -286,7 +286,7 @@ my ($pdata) = @_; my @licenses = sort (keys %{$pdata->{'license'}}); - my $out = join ", ", @licenses; + my $out = join " and ", @licenses; return $out; } @@ -359,18 +359,20 @@ $out .= write_conditional_lines($pld, $locale, \&write_conditional_version_definition, 0); $out .= "\%package -n myspell-$pld->{'default'}{'pack_suffix'}\n"; - $out .= "License: " . join (", ", @{$pld->{'default'}{'license'}}) . "\n"; if (defined $condition_tag) { $out .= "Version: %${locale}_version\n"; } else { $out .= "Version: $pld->{'default'}{'version'}\n"; } - $out .= "Release: 1\n"; - $out .= "Group: Productivity/Text/Spell\n"; + $out .= "Release: 0\n"; $out .= "Summary: $pld->{'default'}{'language'} Dictionary for MySpell\n"; + $out .= "License: " . join (" and ", @{$pld->{'default'}{'license'}}) . "\n"; + $out .= "Group: Productivity/Text/Spell\n"; $out .= "Provides: myspell-dictionary\n"; $out .= "Provides: ooo-dictionaries:/usr/lib/ooo-1.1/share/dict/ooo/${locale}.dic\n"; - $out .= "Provides: locale(libreoffice:$pld->{'default'}{'prov_lang'}) locale(OpenOffice_org:$pld->{'default'}{'prov_lang'}) locale(seamonkey-spellchecker:$pld->{'default'}{'prov_lang'})\n"; + $out .= "Provides: locale(OpenOffice_org:$pld->{'default'}{'prov_lang'})\n"; + $out .= "Provides: locale(libreoffice:$pld->{'default'}{'prov_lang'})\n"; + $out .= "Provides: locale(seamonkey-spellchecker:$pld->{'default'}{'prov_lang'})\n"; if (defined $pld->{'default'}{'dependency'}) { foreach my $dep (@{$pld->{'default'}{'dependency'}}) { $out .= "$dep\n"; ++++++ myspell-dictionaries.data ++++++ ++++ 1032 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/myspell-dictionaries/myspell-dictionaries.data ++++ and /work/SRC/openSUSE:Factory/.myspell-dictionaries.new/myspell-dictionaries.data ++++++ myspell-dictionaries.spec.in ++++++ --- /var/tmp/diff_new_pack.klXSd4/_old 2012-04-12 09:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.klXSd4/_new 2012-04-12 09:42:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package myspell-dictionaries # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - -Name: myspell-dictionaries @DO_NOT_EDIT_COMMENT@ -BuildRequires: dos2unix recode unzip -License: @ALL_LICENSES@ -Group: Productivity/Text/Spell -AutoReqProv: on +Name: myspell-dictionaries Version: 20090731 -Release: 1 +Release: 0 Summary: A Source Package for Dictionaries Used by MySpell -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +License: @ALL_LICENSES@ +Group: Productivity/Text/Spell Url: http://lingucomponent.openoffice.org/download_dictionary.html # Novell jargon bnc#306333 Source0: Nwordlist.tgz @@ -37,6 +30,11 @@ Source3: myspell-dictionaries.data # dictionaries @SOURCES@ +BuildRequires: dos2unix +BuildRequires: recode +BuildRequires: unzip +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This source package contains dictionaries for MySpell. @@ -44,12 +42,10 @@ The MySpell spell-checker is used by the OpenOffice.org office suite, the Mozilla Composer, and the Mozilla Mail message composition window. - - @METADATA@ %prep %setup -c -install -m 644 %{S:1} . +install -m 644 %{SOURCE1} . # unpack sources for archive in \ @SOURCES_UNPACK@ ; do @@ -90,7 +86,7 @@ %install rm -f filelist.template -install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/myspell/ +install -m 755 -d %{buildroot}%{_datadir}/myspell/ for lang_dir in * ; do test -d $lang_dir || continue # support locales with 2 and 3 letters in the language code: ll_CC.aff and lll_CC.aff @@ -106,18 +102,18 @@ # both .dic and .aff files exists => valid dictionary # initialize file list filelist=`mktemp /tmp/myspell-dictionaries-XXXXXX` - echo "%%defattr(-,root,root)" >$filelist + echo "%%defattr(-,root,root,-)" >$filelist echo "%%dir %{_datadir}/myspell/" >>$filelist # install the dictionary for f in $aff $dic ; do fname=$(basename $f) - if test -f $RPM_BUILD_ROOT%{_datadir}/myspell/$fname ; then + if test -f %{buildroot}%{_datadir}/myspell/$fname ; then echo "Error: file already installed: $f" echo " Probably is provided by two source tarballs" exit 1; fi - install -m 644 $f $RPM_BUILD_ROOT%{_datadir}/myspell/ + install -m 644 $f %{buildroot}%{_datadir}/myspell/ echo %{_datadir}/myspell/$fname >>$filelist done @@ -134,7 +130,7 @@ locale="${lang}_${country}" # detect long language name - case "$locale" in + case "$locale" in @LANG_NAME@ *) echo "Error: do not know language name for the locale $locale" exit 1 ;; @@ -143,12 +139,12 @@ # detect README encoding coding=`LC_CTYPE="$locale" locale -k LC_CTYPE | grep charmap | sed "s|charmap=\"\(.*\)\"\$|\1|"` # special hack for some locales - case "$locale" in + case "$locale" in @ENCODING@ esac # install documentation docdir=%{_docdir}/myspell-$lang_name - mkdir -p $RPM_BUILD_ROOT$docdir + mkdir -p %{buildroot}$docdir echo "%%doc $docdir" >>$filelist for doc in `find $lang_dir -type f -printf "%%P\n" | \ grep -v -e ".aff$" -e ".dic$" -e ".dat$" -e ".idx$" \ @@ -161,8 +157,8 @@ recode utf8..utf16 <$lang_dir/$doc >/dev/null 2>&1 || recode $coding..utf8 $lang_dir/$doc dos2unix $lang_dir/$doc dname=$(dirname $doc) - install -m 755 -d $RPM_BUILD_ROOT$docdir/$dname - install -m 644 $lang_dir/$doc $RPM_BUILD_ROOT$docdir/$dname + install -m 755 -d %{buildroot}$docdir/$dname + install -m 644 $lang_dir/$doc %{buildroot}$docdir/$dname done # rename the file list according to the detacted lang and country mv $filelist $locale.list @@ -174,8 +170,5 @@ echo "******" -%clean -rm -rf $RPM_BUILD_ROOT - @FILES@ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org