Hello community, here is the log from the commit of package libreoffice-hyphen for openSUSE:12.2 checked in at 2012-07-02 21:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libreoffice-hyphen (Old) and /work/SRC/openSUSE:12.2/.libreoffice-hyphen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice-hyphen", Maintainer is "pmladek@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/libreoffice-hyphen/libreoffice-hyphen.changes 2012-06-25 15:44:59.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libreoffice-hyphen.new/libreoffice-hyphen.changes 2012-07-02 21:24:25.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 29 16:02:16 UTC 2012 - pmladek@suse.com + +- update license to follow spdx.org standard (bnc#768371) +- spec clean up + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-hyphen.spec ++++++ --- /var/tmp/diff_new_pack.bjjgl0/_old 2012-07-02 21:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.bjjgl0/_new 2012-07-02 21:24:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-hyphen (Version 20080929) +# spec file for package libreoffice-hyphen # -# Copyright (c) 2010 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,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libreoffice-hyphen ################################################################### @@ -23,64 +22,110 @@ ## Generated by: ## perl libreoffice-hyphen-gen-spec libreoffice-hyphen.spec.in libreoffice-hyphen.data ################################################################### -BuildRequires: dos2unix recode unzip +BuildRequires: dos2unix +BuildRequires: recode +BuildRequires: unzip %if %suse_version > 1020 BuildRequires: fdupes %endif -License: Freeware, GPLv2, GPLv2+, GPLv3, GPLv3+, LGPLv2.1, LGPLv2.1+, LGPLv3, LGPLv3+, LPPL -Group: Productivity/Office/Dictionary Version: 20110203.1 -Release: 2 -AutoReqProv: on +Release: 0 Summary: Hyphen Dictionaries for LibreOffice -Provides: locale(libreoffice:af) locale(OpenOffice_org:af) -Provides: locale(libreoffice:be_UA) locale(OpenOffice_org:be_UA) -Provides: locale(libreoffice:bg) locale(OpenOffice_org:bg) -Provides: locale(libreoffice:bn_BD) locale(OpenOffice_org:bn_BD) -Provides: locale(libreoffice:ca) locale(OpenOffice_org:ca) -Provides: locale(libreoffice:cs) locale(OpenOffice_org:cs) -Provides: locale(libreoffice:da) locale(OpenOffice_org:da) -Provides: locale(libreoffice:de_AT) locale(OpenOffice_org:de_AT) -Provides: locale(libreoffice:de_CH) locale(OpenOffice_org:de_CH) -Provides: locale(libreoffice:de_DE) locale(OpenOffice_org:de_DE) -Provides: locale(libreoffice:el) locale(OpenOffice_org:el) -Provides: locale(libreoffice:en_US) locale(OpenOffice_org:en_US) -Provides: locale(libreoffice:en_GB) locale(OpenOffice_org:en_GB) -Provides: locale(libreoffice:en_CA) locale(OpenOffice_org:en_CA) -Provides: locale(libreoffice:es) locale(OpenOffice_org:es) -Provides: locale(libreoffice:es) locale(OpenOffice_org:es) -Provides: locale(libreoffice:et) locale(OpenOffice_org:et) -Provides: locale(libreoffice:fi) locale(OpenOffice_org:fi) -Provides: locale(libreoffice:fr_BE) locale(OpenOffice_org:fr_BE) -Provides: locale(libreoffice:fr_FR) locale(OpenOffice_org:fr_FR) -Provides: locale(libreoffice:ga) locale(OpenOffice_org:ga) -Provides: locale(libreoffice:gu) locale(OpenOffice_org:gu) -Provides: locale(libreoffice:hi) locale(OpenOffice_org:hi) -Provides: locale(libreoffice:hr) locale(OpenOffice_org:hr) -Provides: locale(libreoffice:hu) locale(OpenOffice_org:hu) -Provides: locale(libreoffice:id) locale(OpenOffice_org:id) -Provides: locale(libreoffice:is) locale(OpenOffice_org:is) -Provides: locale(libreoffice:it) locale(OpenOffice_org:it) -Provides: locale(libreoffice:ku) locale(OpenOffice_org:ku) -Provides: locale(libreoffice:lt) locale(OpenOffice_org:lt) -Provides: locale(libreoffice:lv) locale(OpenOffice_org:lv) -Provides: locale(libreoffice:ml_IN) locale(OpenOffice_org:ml_IN) -Provides: locale(libreoffice:mr) locale(OpenOffice_org:mr) -Provides: locale(libreoffice:nb) locale(OpenOffice_org:nb) -Provides: locale(libreoffice:nl) locale(OpenOffice_org:nl) -Provides: locale(libreoffice:nn) locale(OpenOffice_org:nn) -Provides: locale(libreoffice:pl) locale(OpenOffice_org:pl) -Provides: locale(libreoffice:pt_PT) locale(OpenOffice_org:pt_PT) -Provides: locale(libreoffice:pt_BR) locale(OpenOffice_org:pt_BR) -Provides: locale(libreoffice:ro) locale(OpenOffice_org:ro) -Provides: locale(libreoffice:ru) locale(OpenOffice_org:ru) -Provides: locale(libreoffice:sk) locale(OpenOffice_org:sk) -Provides: locale(libreoffice:sl) locale(OpenOffice_org:sl) -Provides: locale(libreoffice:sv) locale(OpenOffice_org:sv) -Provides: locale(libreoffice:uk) locale(OpenOffice_org:uk) +License: GPL-2.0 and GPL-2.0+ and GPL-3.0 and GPL-3.0+ and LGPL-2.1 and LGPL-2.1+ and LGPL-3.0 and LGPL-3.0+ and LPPL-1.2 and SUSE-Freeware +Group: Productivity/Office/Dictionary #compat stuff -Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/hyph_en_US.dic Provides: OpenOffice_org-hyphen = %version +Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/hyph_en_US.dic +Provides: locale(OpenOffice_org:af) +Provides: locale(OpenOffice_org:be_UA) +Provides: locale(OpenOffice_org:bg) +Provides: locale(OpenOffice_org:bn_BD) +Provides: locale(OpenOffice_org:ca) +Provides: locale(OpenOffice_org:cs) +Provides: locale(OpenOffice_org:da) +Provides: locale(OpenOffice_org:de_AT) +Provides: locale(OpenOffice_org:de_CH) +Provides: locale(OpenOffice_org:de_DE) +Provides: locale(OpenOffice_org:el) +Provides: locale(OpenOffice_org:en_CA) +Provides: locale(OpenOffice_org:en_GB) +Provides: locale(OpenOffice_org:en_US) +Provides: locale(OpenOffice_org:es) +Provides: locale(OpenOffice_org:es) +Provides: locale(OpenOffice_org:et) +Provides: locale(OpenOffice_org:fi) +Provides: locale(OpenOffice_org:fr_BE) +Provides: locale(OpenOffice_org:fr_FR) +Provides: locale(OpenOffice_org:ga) +Provides: locale(OpenOffice_org:gu) +Provides: locale(OpenOffice_org:hi) +Provides: locale(OpenOffice_org:hr) +Provides: locale(OpenOffice_org:hu) +Provides: locale(OpenOffice_org:id) +Provides: locale(OpenOffice_org:is) +Provides: locale(OpenOffice_org:it) +Provides: locale(OpenOffice_org:ku) +Provides: locale(OpenOffice_org:lt) +Provides: locale(OpenOffice_org:lv) +Provides: locale(OpenOffice_org:ml_IN) +Provides: locale(OpenOffice_org:mr) +Provides: locale(OpenOffice_org:nb) +Provides: locale(OpenOffice_org:nl) +Provides: locale(OpenOffice_org:nn) +Provides: locale(OpenOffice_org:pl) +Provides: locale(OpenOffice_org:pt_BR) +Provides: locale(OpenOffice_org:pt_PT) +Provides: locale(OpenOffice_org:ro) +Provides: locale(OpenOffice_org:ru) +Provides: locale(OpenOffice_org:sk) +Provides: locale(OpenOffice_org:sl) +Provides: locale(OpenOffice_org:sv) +Provides: locale(OpenOffice_org:uk) +Provides: locale(libreoffice:af) +Provides: locale(libreoffice:be_UA) +Provides: locale(libreoffice:bg) +Provides: locale(libreoffice:bn_BD) +Provides: locale(libreoffice:ca) +Provides: locale(libreoffice:cs) +Provides: locale(libreoffice:da) +Provides: locale(libreoffice:de_AT) +Provides: locale(libreoffice:de_CH) +Provides: locale(libreoffice:de_DE) +Provides: locale(libreoffice:el) +Provides: locale(libreoffice:en_CA) +Provides: locale(libreoffice:en_GB) +Provides: locale(libreoffice:en_US) +Provides: locale(libreoffice:es) +Provides: locale(libreoffice:es) +Provides: locale(libreoffice:et) +Provides: locale(libreoffice:fi) +Provides: locale(libreoffice:fr_BE) +Provides: locale(libreoffice:fr_FR) +Provides: locale(libreoffice:ga) +Provides: locale(libreoffice:gu) +Provides: locale(libreoffice:hi) +Provides: locale(libreoffice:hr) +Provides: locale(libreoffice:hu) +Provides: locale(libreoffice:id) +Provides: locale(libreoffice:is) +Provides: locale(libreoffice:it) +Provides: locale(libreoffice:ku) +Provides: locale(libreoffice:lt) +Provides: locale(libreoffice:lv) +Provides: locale(libreoffice:ml_IN) +Provides: locale(libreoffice:mr) +Provides: locale(libreoffice:nb) +Provides: locale(libreoffice:nl) +Provides: locale(libreoffice:nn) +Provides: locale(libreoffice:pl) +Provides: locale(libreoffice:pt_BR) +Provides: locale(libreoffice:pt_PT) +Provides: locale(libreoffice:ro) +Provides: locale(libreoffice:ru) +Provides: locale(libreoffice:sk) +Provides: locale(libreoffice:sl) +Provides: locale(libreoffice:sv) +Provides: locale(libreoffice:uk) Obsoletes: OpenOffice_org-hyphen <= %version BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -98,11 +143,11 @@ Source1008: dict-de_CH-frami_2010-03-07.oxt Source1009: dict-de_DE-frami_2010-03-07.oxt Source1010: hyph_el_GR.tar.bz2 -Source1011: hyph_en_US.tar.bz2 +Source1011: hyph_en_CA.tar.bz2 Source1012: hyph_en_GB.tar.bz2 -Source1013: hyph_en_CA.tar.bz2 -Source1014: dict-es_VE.oxt -Source1015: hyph_es_ES.tar.bz2 +Source1013: hyph_en_US.tar.bz2 +Source1014: hyph_es_ES.tar.bz2 +Source1015: dict-es_VE.oxt Source1016: dict-et.oxt Source1017: hyph_fi_FI.tar.bz2 Source1018: hyph_fr_BE.tar.bz2 @@ -124,8 +169,8 @@ Source1034: hyph_nl_NL.tar.bz2 Source1035: hyph_nn_NO.tar.bz2 Source1036: pl-dict.oxt -Source1037: oo3x-pt-PT.oxt -Source1038: Vero_pt_BR_V207AOC.oxt +Source1037: Vero_pt_BR_V207AOC.oxt +Source1038: oo3x-pt-PT.oxt Source1039: dict-ro.1.1.oxt Source1040: dict_ru_RU-0.3.4.oxt Source1041: dict-sk.oxt ++++++ libreoffice-hyphen-gen-spec ++++++ --- /var/tmp/diff_new_pack.bjjgl0/_old 2012-07-02 21:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.bjjgl0/_new 2012-07-02 21:24:27.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; } @@ -296,13 +296,24 @@ ############################## # all langs sections -sub write_provides_section($$) +sub write_provides_ooo_section($$) { my ($pdata, $locale) = @_; my $pld = \% {$pdata->{'dict'}{$locale}}; my $out = ""; - $out .= "Provides: locale(libreoffice:$pld->{'default'}{'prov_lang'}) locale(OpenOffice_org:$pld->{'default'}{'prov_lang'})\n"; + $out .= "Provides: locale(OpenOffice_org:$pld->{'default'}{'prov_lang'})\n"; + + return $out; +} + +sub write_provides_lo_section($$) +{ + my ($pdata, $locale) = @_; + my $pld = \% {$pdata->{'dict'}{$locale}}; + my $out = ""; + + $out .= "Provides: locale(libreoffice:$pld->{'default'}{'prov_lang'})\n"; return $out; } @@ -370,7 +381,7 @@ $out .= write_conditional_lines($pld, $locale, \&write_conditional_version_definition, 0); $out .= "\%package $pld->{'default'}{'pack_suffix'}\n"; - $out .= "License: " . join (", ", @{$pld->{'default'}{'license'}}) . "\n"; + $out .= "License: " . join (" or ", @{$pld->{'default'}{'license'}}) . "\n"; if (defined $condition_tag) { $out .= "Version: %${locale}_version\n"; } else { @@ -431,12 +442,6 @@ ######################################################## # universal writing functions -sub sort_dictionaries() -{ - # sort the dictionaries by the package name - $pdata_sort->{'dict'}{$a}->{'default'}{'pack_suffix'} cmp $pdata_sort->{'dict'}{$b}->{'default'}{'pack_suffix'}; -} - # the text is different on different distributions sub write_conditional_lines($$$$) { @@ -480,7 +485,7 @@ my $out = ""; $pdata_sort = $pdata; - foreach my $locale (sort sort_dictionaries keys %{$pdata->{'dict'}}) { + foreach my $locale (sort keys %{$pdata->{'dict'}}) { $out .= "$pdata->{'dict'}{$locale}->{'contition_dict'}\n" if (defined $pdata->{'dict'}{$locale}->{'contition_dict'}); $out .= & {$write_section} ($pdata, $locale); $out .= "\%endif\n" if (defined $pdata->{'dict'}{$locale}->{'contition_dict'}); @@ -497,7 +502,7 @@ my $out = ""; $pdata_sort = $pdata; - foreach my $locale (sort sort_dictionaries keys %{$pdata->{'dict'}}) { + foreach my $locale (sort keys %{$pdata->{'dict'}}) { $out .= & {$write_section} ($pdata, $locale); } return $out; @@ -517,7 +522,8 @@ my $all_licenses = write_simple_section ($pdata, \&write_all_licenses_section); my $do_not_edit = write_simple_section ($pdata, \&write_do_not_edit_section); - my $provides = write_locale_sections ($pdata, \&write_provides_section); + my $provides_ooo = write_locale_sections ($pdata, \&write_provides_ooo_section); + my $provides_lo = write_locale_sections ($pdata, \&write_provides_lo_section); my $sources = write_locale_sections ($pdata, \&write_sources_section); # my $metadata = write_locale_sections_optional ($pdata, \&write_metadata_section, "\n\n\n"); my $sources_unpack = write_locale_sections_optional ($pdata, \&write_sources_unpack_section, ""); @@ -537,7 +543,8 @@ while( my $line = <TEMPLATE>) { $line =~ s/\@ALL_LICENSES\@/$all_licenses/; $line =~ s/\@DO_NOT_EDIT_COMMENT\@/$do_not_edit/; - $line =~ s/\@PROVIDES\@/$provides/; + $line =~ s/\@PROVIDES_OOO\@/$provides_ooo/; + $line =~ s/\@PROVIDES_LO\@/$provides_lo/; $line =~ s/\@SOURCES\@/$sources/; # $line =~ s/\@METADATA\@/$metadata/; $line =~ s/\@SOURCES_UNPACK@/$sources_unpack/; ++++++ libreoffice-hyphen.data ++++++ --- /var/tmp/diff_new_pack.bjjgl0/_old 2012-07-02 21:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.bjjgl0/_new 2012-07-02 21:24:27.000000000 +0200 @@ -14,7 +14,8 @@ # the full locale here again, e.g. de_DE vs de_AT # Version: package version, e.g. 2.1.5 # Source: source file name, e.g. catalan.oxt -# License: comma separated list of dictionary licenses, e.g. GPLv2, LGPLv2.1 +# License: comma separated list of dictionary licenses, e.g. GPL-2.0, LGPL-2.1 +# they need to follow the spdx.org standard, see http://spdx.org/licenses/ # Types: comma separated list of included dictionary types; possible values are: # myspell, hunspell, hyphen, thesaurus # URL: url where the dictionary sources was taken from, e.g. @@ -36,7 +37,7 @@ URL: http://extensions.services.openoffice.org/project/dict_af Version: 20080701 Types: hunspell, hyphen -License: LGPLv2.1+ +License: LGPL-2.1+ Source: dict-af.oxt Locale: bg_BG @@ -44,7 +45,7 @@ URL: http://extensions.services.openoffice.org/project/dictionaries-bg Version: 4.1.5 Types: myspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 Source: dictionaries-bg.oxt Locale: be_BY @@ -52,7 +53,7 @@ Prov_lang: be_UA Version: 1.1 Types: myspell, hyphen -License: LGPLv3 +License: LGPL-3.0 URL: http://extensions.services.openoffice.org/project/dict-be-classic Source: dict-be-classic.oxt @@ -61,7 +62,7 @@ Prov_lang: bn_BD Version: 1.2 Types: hyphen -License: GPLv3+, LGPLv3+ +License: GPL-3.0+, LGPL-3.0+ #, hunspell available: http://extensions.services.openoffice.org/project/dict-bn URL: http://extensions.services.openoffice.org/project/hyph_bn_IN # both locales are supported by OOo @@ -72,7 +73,7 @@ Language: Catalan Version: 0.9.3 Types: hyphen -License: GPLv3 +License: GPL-3.0 # hunspell available: http://extensions.services.openoffice.org/project/dict-catalan # thesaurus available: http://extensions.services.openoffice.org/project/thesaurus-ca URL: http://extensions.services.openoffice.org/project/ca_hyph @@ -84,13 +85,13 @@ Language: Czech Version: 20031228 Types: hunspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 URL: http://extensions.services.openoffice.org/project/dict-cs Source: dict-cs-2.0.oxt Locale: da_DK Language: Danish -License: LGPLv2.1 +License: LGPL-2.1 # alternative URL: http://extensions.services.openoffice.org/project/dict-da # dict-da-current.oxt does not mention the license for the hypen dictionary URL: http://wiki.services.openoffice.org/wiki/Dictionaries @@ -101,7 +102,7 @@ Prov_lang: de_AT Version: 20100307 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/dict-de_AT_frami Source: dict-de_AT-frami_2010-03-07.oxt @@ -110,7 +111,7 @@ Prov_lang: de_CH Version: 20100307 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/dict-de_CH_frami Source: dict-de_CH-frami_2010-03-07.oxt @@ -119,12 +120,12 @@ Prov_lang: de_DE Version: 20100307 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/dict-de_DE_frami Source: dict-de_DE-frami_2010-03-07.oxt Locale: el_GR -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_el_GR.tar.bz2 @@ -134,19 +135,19 @@ # Prov_lang: en_AU # Version: 20081215 # Types: myspell, hyphen, thesaurus -# License: GPLv2+ +# License: GPL-2.0+ # URL: http://extensions.services.openoffice.org/project/AustralianDictionary # Source: dict-en-au-2008-12-15.oxt Locale: en_CA Prov_lang: en_CA -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_en_CA.tar.bz2 Locale: en_GB Prov_lang: en_GB -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_en_GB.tar.bz2 @@ -157,12 +158,12 @@ # URL: http://extensions.services.openoffice.org/project/dict-en-nz-2008-12-03 # Version: 20081204 # 0.90.0 # Types: myspell, hyphen, thesaurus -# License: GPLv2, LGPLv2.1 +# License: GPL-2.0, LGPL-2.1 # Source: dict-en-nz-2008-12-03.oxt Locale: en_US Prov_lang: en_US -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_en_US.tar.bz2 @@ -174,11 +175,11 @@ # URL: http://extensions.services.openoffice.org/project/diccionario_es_AR # Version: 0.1 # Types: myspell, hyphen, thesaurus -# License: GPLv3, LGPLv2.1, MPLv1.1 +# License: GPL-3.0, LGPL-2.1, MPL-1.1 # Source: Diccionarios-Argentina_1.oxt Locale: es_ES -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_es_ES.tar.bz2 @@ -186,7 +187,7 @@ Language: Venezuelan Spanish Version: 1.0.1 Types: hunspell, hyphen, thesaurus -License: LGPLv3+ +License: LGPL-3.0+ URL: http://extensions.services.openoffice.org/project/dict-es_VE Source: dict-es_VE.oxt @@ -194,18 +195,18 @@ Language: Estonian Version: 1.0 Types: myspell, hyphen -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/dict_et Source: dict-et.oxt Locale: fi_FI -License: Freeware +License: SUSE-Freeware URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_fi_FI.tar.bz2 Locale: fr_BE Prov_lang: fr_BE -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_fr_BE.tar.bz2 @@ -215,7 +216,7 @@ Version: 20100125 # 3.5 Types: myspell, hyphen, thesaurus # under investigation, it looks it belongs to several countries -License: LGPLv2.1+ +License: LGPL-2.1+ URL: http://extensions.services.openoffice.org/project/french-dictionary-classic-... Prep: mv ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/hyph_fr.dic ooo-dictionnaire-fr-reforme1990-v3.5/dictionaries/hyph_fr_FR.dic Source: ooo-dictionnaire-fr-reforme1990-v3.5.oxt @@ -224,7 +225,7 @@ Language: Irish Version: 20080805 # 4.4 Types: hunspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 URL: http://extensions.services.openoffice.org/project/focloiri-gaeilge Source: focloiri-gaeilge-4.4.oxt @@ -232,7 +233,7 @@ Language: Gujarati Version: 1.1 Types: hyphen -License: GPLv3+, LGPLv3+ +License: GPL-3.0+, LGPL-3.0+ # hunspell available: http://extensions.services.openoffice.org/project/dict-gu URL: http://extensions.services.openoffice.org/project/hyph_gu_IN Source: hyph_gu_1.1.oxt @@ -240,18 +241,18 @@ Locale: hi_IN Language: Hindi Version: 1.2 -License: GPLv3+, LGPLv3+ +License: GPL-3.0+, LGPL-3.0+ # hunspell available: http://extensions.services.openoffice.org/project/dict-hi URL: http://extensions.services.openoffice.org/project/hyph_hi_IN Source: hyph_hi_1.2.oxt Locale: hr_HR -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_hr_HR.tar.bz2 Locale: hu_HU -License: GPLv2 +License: GPL-2.0 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_hu_HU.tar.bz2 @@ -259,7 +260,7 @@ Language: Indonese Version: 20090505 Types: myspell, hyphen -License: GPLv2 +License: GPL-2.0 URL: http://extensions.services.openoffice.org/project/Indonesian_dictionary Prep: mv id/hyph_id.dic id/hyph_id_ID.dic Source: id.oxt @@ -268,7 +269,7 @@ Language: Icelandic Version: 1.0 Types: hyphen -License: GPLv2+, LGPLv2.1+ +License: GPL-2.0+, LGPL-2.1+ # dict available: http://extensions.services.openoffice.org/project/dict-is URL: http://extensions.services.openoffice.org/project/hyph_is Prep: mv hyph_is-1.0/hyph_is.dic hyph_is-1.0/hyph_is_IS.dic @@ -278,7 +279,7 @@ Language: Italian Version: 20071126 Types: hunspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/Dict_it_IT Source: Dizionari.IT_20081129.oxt @@ -288,7 +289,7 @@ Encoding: ISO-8859-9 Version: 1.71.2 Types: myspell -License: GPLv2+, LGPLv2.1+ +License: GPL-2.0+, LGPL-2.1+ # hunspell available: http://extensions.services.openoffice.org/project/rastnivis URL: http://extensions.services.openoffice.org/project/kitandin # FIXME: discuss with the author @@ -296,7 +297,7 @@ Source: kitandin.oxt Locale: lt_LT -License: LPPL +License: LPPL-1.2 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_lt_LT.tar.bz2 @@ -304,7 +305,7 @@ Language: Latvian Version: 20090916 # 0.8.2 Types: hunspell, hyphen, thesaurus -License: GPLv2+ +License: GPL-2.0+ URL: http://extensions.services.openoffice.org/project/dict_lv_LV Source: dict_lv_LV-0.8.2.oxt @@ -313,7 +314,7 @@ Prov_lang: ml_IN Version: 1.3 Types: hunspell -License: GPLv3+, LGPLv3+ +License: GPL-3.0+, LGPL-3.0+ # dict available: http://extensions.services.openoffice.org/project/dict_ml_IN URL: http://extensions.services.openoffice.org/project/hyph_ml_IN Source: hyph_ml_1.3.oxt @@ -322,19 +323,19 @@ Language: Marathi Version: 1.2 Types: hunspell -License: GPLv3+, LGPLv3+ +License: GPL-3.0+, LGPL-3.0+ # hunspell available: http://extensions.services.openoffice.org/project/dict-mr URL: http://extensions.services.openoffice.org/project/hyph_mr_IN Source: hyph_mr_1.2.oxt Locale: nb_NO -License: GPLv2 +License: GPL-2.0 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_nb_NO.tar.bz2 Locale: nl_NL Language: Dutch -License: GPLv2 +License: GPL-2.0 Types: hyphen # alternative URL: http://extensions.services.openoffice.org/project/dict-nl # nl-dict.oxt does not define the license for the bundled hyphen dictionary @@ -342,7 +343,7 @@ Source: hyph_nl_NL.tar.bz2 Locale: nn_NO -License: GPLv2 +License: GPL-2.0 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_nn_NO.tar.bz2 @@ -350,7 +351,7 @@ Language: Polish Version: 3.0a Types: myspell, hyphen, thesaurus -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/pl-dict Source: pl-dict.oxt @@ -359,7 +360,7 @@ Prov_lang: pt_BR Version: 20100111 # 2.0.7 Types: myspell, hyphen -License: LGPLv2.1 +License: LGPL-2.1 URL: http://extensions.services.openoffice.org/project/Vero Source: Vero_pt_BR_V207AOC.oxt @@ -368,7 +369,7 @@ Prov_lang: pt_PT Version: 20091015 # 9.10.13.0 Types: hunspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 URL: http://extensions.services.openoffice.org/project/ptPTdict Source: oo3x-pt-PT.oxt @@ -376,7 +377,7 @@ Language: Romanian Version: 20091130 # 1.1 Types: hunspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 URL: http://extensions.services.openoffice.org/project/dictionaries-ro-contempora... Source: dict-ro.1.1.oxt @@ -385,7 +386,7 @@ # TODO no source URL Version: 20081013 # 0.3.4 Types: myspell, hyphen, thesaurus -License: LGPLv3 +License: LGPL-3.0 # there is a newer version out there with copyrigh, try to catch the owner to release is URL: http://extensions.services.openoffice.org/project/dict_ru_RU_hyph Source: dict_ru_RU-0.3.4.oxt @@ -395,23 +396,23 @@ URL: http://extensions.services.openoffice.org/project/dict-sk Version: 20100208 Types: hunspell, hyphen, thesaurus -License: GPLv2 +License: GPL-2.0 Source: dict-sk.oxt Locale: sl_SI Language: Slovene Version: 20091130 # 1.0 Types: myspell, hyphen -License: LGPLv2.1, GPLv2 +License: LGPL-2.1, GPL-2.0 URL: http://extensions.services.openoffice.org/project/pack-sl Source: pack-sl.oxt Locale: sv_SE -License: LGPLv2.1 +License: LGPL-2.1 URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_sv_SE.tar.bz2 Locale: uk_UA -License: GPLv2+ +License: GPL-2.0+ URL: http://wiki.services.openoffice.org/wiki/Dictionaries Source: hyph_uk_UA.tar.bz2 ++++++ libreoffice-hyphen.spec.in ++++++ --- /var/tmp/diff_new_pack.bjjgl0/_old 2012-07-02 21:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.bjjgl0/_new 2012-07-02 21:24:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-hyphen (Version 20080929) +# spec file for package libreoffice-hyphen # -# Copyright (c) 2010 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,23 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libreoffice-hyphen @DO_NOT_EDIT_COMMENT@ -BuildRequires: dos2unix recode unzip +BuildRequires: dos2unix +BuildRequires: recode +BuildRequires: unzip %if %suse_version > 1020 BuildRequires: fdupes %endif -License: @ALL_LICENSES@ -Group: Productivity/Office/Dictionary Version: 20110203.1 -Release: 2 -AutoReqProv: on +Release: 0 Summary: Hyphen Dictionaries for LibreOffice -@PROVIDES@#compat stuff +License: @ALL_LICENSES@ +Group: Productivity/Office/Dictionary +#compat stuff +@PROVIDES_OOO@@PROVIDES_LO@Provides: OpenOffice_org-hyphen = %version Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/hyph_en_US.dic -Provides: OpenOffice_org-hyphen = %version Obsoletes: OpenOffice_org-hyphen <= %version BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org