Hello community,
here is the log from the commit of package libreoffice-hyphen for
openSUSE:Factory checked in at 2014-02-05 13:44:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice-hyphen (Old)
and /work/SRC/openSUSE:Factory/.libreoffice-hyphen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice-hyphen"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice-hyphen/libreoffice-hyphen.changes
2012-07-02 21:24:20.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libreoffice-hyphen.new/libreoffice-hyphen.changes
2014-02-05 13:44:13.000000000 +0100
@@ -1,0 +2,16 @@
+Sun Jan 26 09:21:40 UTC 2014 - [email protected]
+
+- Remove old english hyph tarballs too.
+
+-------------------------------------------------------------------
+Sun Jan 26 09:21:01 UTC 2014 - [email protected]
+
+- Remove more compat stuff with old openoffice.
+
+-------------------------------------------------------------------
+Sun Jan 26 09:10:26 UTC 2014 - [email protected]
+
+- English hyphen is in the hyphen package itself with newer version
+ simply just use that one and remove it from here.
+
+-------------------------------------------------------------------
Old:
----
hyph_en_CA.tar.bz2
hyph_en_GB.tar.bz2
hyph_en_US.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-hyphen.spec ++++++
--- /var/tmp/diff_new_pack.UbvfiK/_old 2014-02-05 13:44:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UbvfiK/_new 2014-02-05 13:44:15.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-hyphen
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -23,11 +23,9 @@
## perl libreoffice-hyphen-gen-spec libreoffice-hyphen.spec.in
libreoffice-hyphen.data
###################################################################
BuildRequires: dos2unix
+BuildRequires: fdupes
BuildRequires: recode
BuildRequires: unzip
-%if %suse_version > 1020
-BuildRequires: fdupes
-%endif
Version: 20110203.1
Release: 0
Summary: Hyphen Dictionaries for LibreOffice
@@ -35,7 +33,6 @@
Group: Productivity/Office/Dictionary
#compat stuff
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)
@@ -47,9 +44,6 @@
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)
@@ -92,9 +86,6 @@
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)
@@ -126,7 +117,6 @@
Provides: locale(libreoffice:sl)
Provides: locale(libreoffice:sv)
Provides: locale(libreoffice:uk)
-Obsoletes: OpenOffice_org-hyphen <= %version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Source0: libreoffice-hyphen-gen-spec
@@ -143,40 +133,37 @@
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_CA.tar.bz2
-Source1012: hyph_en_GB.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
-Source1019: ooo-dictionnaire-fr-reforme1990-v3.5.oxt
-Source1020: focloiri-gaeilge-4.4.oxt
-Source1021: hyph_gu_1.1.oxt
-Source1022: hyph_hi_1.2.oxt
-Source1023: hyph_hr_HR.tar.bz2
-Source1024: hyph_hu_HU.tar.bz2
-Source1025: id.oxt
-Source1026: hyph_is-1.0.oxt
-Source1027: Dizionari.IT_20081129.oxt
-Source1028: kitandin.oxt
-Source1029: hyph_lt_LT.tar.bz2
-Source1030: dict_lv_LV-0.8.2.oxt
-Source1031: hyph_ml_1.3.oxt
-Source1032: hyph_mr_1.2.oxt
-Source1033: hyph_nb_NO.tar.bz2
-Source1034: hyph_nl_NL.tar.bz2
-Source1035: hyph_nn_NO.tar.bz2
-Source1036: pl-dict.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
-Source1042: pack-sl.oxt
-Source1043: hyph_sv_SE.tar.bz2
-Source1044: hyph_uk_UA.tar.bz2
+Source1011: hyph_es_ES.tar.bz2
+Source1012: dict-es_VE.oxt
+Source1013: dict-et.oxt
+Source1014: hyph_fi_FI.tar.bz2
+Source1015: hyph_fr_BE.tar.bz2
+Source1016: ooo-dictionnaire-fr-reforme1990-v3.5.oxt
+Source1017: focloiri-gaeilge-4.4.oxt
+Source1018: hyph_gu_1.1.oxt
+Source1019: hyph_hi_1.2.oxt
+Source1020: hyph_hr_HR.tar.bz2
+Source1021: hyph_hu_HU.tar.bz2
+Source1022: id.oxt
+Source1023: hyph_is-1.0.oxt
+Source1024: Dizionari.IT_20081129.oxt
+Source1025: kitandin.oxt
+Source1026: hyph_lt_LT.tar.bz2
+Source1027: dict_lv_LV-0.8.2.oxt
+Source1028: hyph_ml_1.3.oxt
+Source1029: hyph_mr_1.2.oxt
+Source1030: hyph_nb_NO.tar.bz2
+Source1031: hyph_nl_NL.tar.bz2
+Source1032: hyph_nn_NO.tar.bz2
+Source1033: pl-dict.oxt
+Source1034: Vero_pt_BR_V207AOC.oxt
+Source1035: oo3x-pt-PT.oxt
+Source1036: dict-ro.1.1.oxt
+Source1037: dict_ru_RU-0.3.4.oxt
+Source1038: dict-sk.oxt
+Source1039: pack-sl.oxt
+Source1040: hyph_sv_SE.tar.bz2
+Source1041: hyph_uk_UA.tar.bz2
%description
These dictionaries help you to hyphenate texts and words in the
@@ -230,9 +217,6 @@
%{S:1039} \
%{S:1040} \
%{S:1041} \
- %{S:1042} \
- %{S:1043} \
- %{S:1044} \
; do
archive_name=`basename $archive | sed -e "s|.zip$||" -e "s|.oxt$||" -e
"s|.tar.gz$||" -e "s|.tar.bz2$||"`
mkdir $archive_name || exit 1;
@@ -270,16 +254,11 @@
%install
install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/hyphen
install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/%{name}
-# compat stuff
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/ooo/hyphen
# init file list
filelist=files.list
echo "%%defattr(-,root,root)" >$filelist
echo "%%dir %{_docdir}/libreoffice-hyphen" >>$filelist
echo "%%dir %{_datadir}/hyphen" >>$filelist
-# compat stuff
-echo "%%dir %{_datadir}/ooo" >>$filelist
-echo "%%dir %{_datadir}/ooo/hyphen" >>$filelist
# process all directories
for lang_dir in * ; do
test -d $lang_dir || continue
@@ -295,9 +274,6 @@
fi
install -m 644 $dic $RPM_BUILD_ROOT%{_datadir}/hyphen/
echo %{_datadir}/hyphen/$fname >>$filelist
- # compat stuff
- ln -sf ../../hyphen/$fname $RPM_BUILD_ROOT%{_datadir}/ooo/hyphen/
- echo %{_datadir}/ooo/hyphen/$fname >>$filelist
done
# detect locale, lang and country
@@ -338,12 +314,7 @@
done
done
# link duplicated files
-%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files -f files.list
++++++ libreoffice-hyphen.data ++++++
--- /var/tmp/diff_new_pack.UbvfiK/_old 2014-02-05 13:44:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UbvfiK/_new 2014-02-05 13:44:15.000000000 +0100
@@ -130,44 +130,6 @@
Source: hyph_el_GR.tar.bz2
# FIXME: the license of the hyphen dictionary is unclear
-# Locale: en_AU
-# Language: Australian
-# Prov_lang: en_AU
-# Version: 20081215
-# Types: myspell, hyphen, thesaurus
-# 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: 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: LGPL-2.1
-URL: http://wiki.services.openoffice.org/wiki/Dictionaries
-Source: hyph_en_GB.tar.bz2
-
-# FIXME: the license of the hyphen dictionary is unclear
-# Locale: en_NZ
-# Language: New Zealand
-# Prov_lang: en_NZ
-# URL:
http://extensions.services.openoffice.org/project/dict-en-nz-2008-12-03
-# Version: 20081204 # 0.90.0
-# Types: myspell, hyphen, thesaurus
-# License: GPL-2.0, LGPL-2.1
-# Source: dict-en-nz-2008-12-03.oxt
-
-Locale: en_US
-Prov_lang: en_US
-License: LGPL-2.1
-URL: http://wiki.services.openoffice.org/wiki/Dictionaries
-Source: hyph_en_US.tar.bz2
-
-# FIXME: the license of the hyphen dictionary is unclear
# Locale: es_AR
# Language: Argentine Spanish
# pack_suffix: spanish-argentine
++++++ libreoffice-hyphen.spec.in ++++++
--- /var/tmp/diff_new_pack.UbvfiK/_old 2014-02-05 13:44:15.000000000 +0100
+++ /var/tmp/diff_new_pack.UbvfiK/_new 2014-02-05 13:44:15.000000000 +0100
@@ -20,9 +20,7 @@
BuildRequires: dos2unix
BuildRequires: recode
BuildRequires: unzip
-%if %suse_version > 1020
BuildRequires: fdupes
-%endif
Version: 20110203.1
Release: 0
Summary: Hyphen Dictionaries for LibreOffice
@@ -30,8 +28,6 @@
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
-Obsoletes: OpenOffice_org-hyphen <= %version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Source0: libreoffice-hyphen-gen-spec
@@ -79,16 +75,11 @@
%install
install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/hyphen
install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/%{name}
-# compat stuff
-install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/ooo/hyphen
# init file list
filelist=files.list
echo "%%defattr(-,root,root)" >$filelist
echo "%%dir %{_docdir}/libreoffice-hyphen" >>$filelist
echo "%%dir %{_datadir}/hyphen" >>$filelist
-# compat stuff
-echo "%%dir %{_datadir}/ooo" >>$filelist
-echo "%%dir %{_datadir}/ooo/hyphen" >>$filelist
# process all directories
for lang_dir in * ; do
test -d $lang_dir || continue
@@ -104,9 +95,6 @@
fi
install -m 644 $dic $RPM_BUILD_ROOT%{_datadir}/hyphen/
echo %{_datadir}/hyphen/$fname >>$filelist
- # compat stuff
- ln -sf ../../hyphen/$fname $RPM_BUILD_ROOT%{_datadir}/ooo/hyphen/
- echo %{_datadir}/ooo/hyphen/$fname >>$filelist
done
# detect locale, lang and country
@@ -146,12 +134,7 @@
done
done
# link duplicated files
-%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files -f files.list
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
