pool/libreoffice
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Merge up all the icon themes as they have intermixed deps

Browse Source 
- Tweak up langpack generating to work with new gettext .mo files
  * Those macros are pretty ugly

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=558
This commit is contained in:
Tomáš Chvátal
2017-12-04 16:08:15 +00:00
committed by Git OBS Bridge
parent 03f1da76e8
commit 527eb89368
2 changed files with 54 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libreoffice.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 30 12:00:33 UTC 2017 - tchvatal@suse.com
- Merge up all the icon themes as they have intermixed deps
- Tweak up langpack generating to work with new gettext .mo files
* Those macros are pretty ugly
-------------------------------------------------------------------
Wed Nov 29 14:16:30 UTC 2017 - tchvatal@suse.com

173
libreoffice.spec
View File

@@ -310,77 +310,26 @@ BuildArch: noarch
%description branding-upstream
This package includes the original branding for the LibreOffice office suite.
%package icon-theme-breeze
Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default)
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:plasma5-workspace)
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
BuildArch: noarch
%description icon-theme-breeze
This package provides Breeze LibreOffice icon theme. It is used in KDE
Frameworks by default.
%package icon-theme-galaxy
Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default)
%package icon-themes
Summary: LibreOffice Icon Themes
Group: Productivity/Office/Suite
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: libreoffice
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
Provides: %{name}-icon-theme-breeze = %{version}
Obsoletes: %{name}-icon-theme-breeze < %{version}
Provides: %{name}-icon-theme-galaxy = %{version}
Obsoletes: %{name}-icon-theme-galaxy < %{version}
Provides: %{name}-icon-theme-hicontrast = %{version}
Obsoletes: %{name}-icon-theme-hicontrast < %{version}
Provides: %{name}-icon-theme-sifr = %{version}
Obsoletes: %{name}-icon-theme-sifr < %{version}
Provides: %{name}-icon-theme-tango = %{version}
Obsoletes: %{name}-icon-theme-tango < %{version}
BuildArch: noarch
%description icon-theme-galaxy
This package provides Galaxy LibreOffice icon theme. It is used in the original OOo-3.x by default.
%package icon-theme-hicontrast
Summary: Hicontrast LibreOffice Icon Theme
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: libreoffice
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
BuildArch: noarch
%description icon-theme-hicontrast
This package provides Hicontrast LibreOffice icon theme.
%package icon-theme-sifr
Summary: Sifr LibreOffice Icon Theme
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-breeze
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: libreoffice
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
BuildArch: noarch
%description icon-theme-sifr
This package provides Sifr LibreOffice icon theme.
%package icon-theme-tango
Summary: Tango LibreOffice Icon Theme (GNOME default)
Group: Productivity/Office/Suite
Requires: %{name}-icon-theme-galaxy
Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:gnome-session)
Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version}
BuildArch: noarch
%description icon-theme-tango
This package provides Tango LibreOffice icon theme. It is used in GNOME by default
and obsoleted the old Industrial theme.
%description icon-themes
This package provides all of the LibreOffice icon themes.
%package glade
Summary: Support for creating LibreOffice dialogs in glade
@@ -723,31 +672,21 @@ fi \
# Crazy magic for the auto help/lang generating.
# Inspired and adjusted from Fedora spec.
%define _langpack_common() \
%dir %{_datadir}/%{name}/program/resource \
%{_datadir}/%{name}/program/resource/*%{1}.res \
%if "%{1}" != "tn" \
%exclude %{_datadir}/%{name}/program/resource/*sr-Latn.res \
%endif \
%if "%{1}" != "en-US" \
%dir %{_datadir}/%{name}/share/config/soffice.cfg \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/* \
%{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/*/ui \
%dir %{_datadir}/%{name}/share/config/soffice.cfg/* \
%{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res/%{1}.zip \
%define _langpack_common(g:l:j:) \
%if "%{-l*}" != "en-US" \
%dir %{_datadir}/libreoffice/program/resource \
%dir %{_datadir}/libreoffice/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}} \
%dir %{_datadir}/libreoffice/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES \
%{_datadir}/%{name}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES/*.mo \
%endif \
%dir %{_datadir}/%{name}/share/registry \
%dir %{_datadir}/%{name}/share/registry/res \
%{_datadir}/%{name}/share/registry/Langpack-%{1}.xcd \
%if "%{1}" != "en-US" \
%{_datadir}/%{name}/share/registry/res/registry_%{1}.xcd \
%{_datadir}/%{name}/share/registry/Langpack-%{-l*}.xcd \
%if "%{-l*}" != "en-US" \
%{_datadir}/%{name}/share/registry/res/registry_%{-l*}.xcd \
%endif \
%{_datadir}/%{name}/share/registry/res/fcfg_langpack_%{1}.xcd \
%{_datadir}/%{name}/share/registry/res/fcfg_langpack_%{-l*}.xcd \
%{_datadir}/%{name}/share/wizards/resources_%{-j:%{-j*}}%{!-j:%{-l*}}.properties \
%{nil}
# Defines a language pack subpackage.
@@ -772,6 +711,9 @@ fi \
# i: additional language added to this package
# L: internal (LibreOffice) language code, used in file names
# l: language code, e.g., cs
# g: glibc/java locale
# j: java locale for the additional language
# k: glibc locale for the additional language
# Mm: myspell dependency
# n: language name, e.g., Czech
# p: Provides: of libreoffice-l10n
@@ -785,7 +727,7 @@ fi \
# Example:
# libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ:
# %%langpack -l cs -n Czech -m cs_CZ
%define langpack(c:Ei:L:l:Mm:n:p:q:r:S:s:Xx:) \
%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:Xx:) \
%define project LibreOffice \
%define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \
%define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \
@@ -832,11 +774,11 @@ Provides additional %{langname} translations and resources for %{project}. \
%{!-E: \
%define autotextdir %{_datadir}/%{name}/share/autotext \
%dir %{autotextdir} \
%{expand:%%_langpack_common %{_langpack_lang}} \
%{expand:%%_langpack_common -l %{_langpack_lang} %{-g:-g %{-g*} -j %{-g*}}} \
%{-x:%{autotextdir}/%{-x*}}%{!-x:%{-X:%{autotextdir}/%{_langpack_lang}}} \
%{-c:%{_datadir}/%{name}/share/registry/%{-c*}.xcd} \
%{-s:%{_datadir}/%{name}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \
%{-i:%{expand:%%_langpack_common %{-i*}}} \
%{-i:%{expand:%%_langpack_common -l %{-i*} %{-k:-g %{-k*}} %{-j:-j %{-j*}}}} \
} \
\
%{expand:%%_link_noarch_files %{pkgname}} \
@@ -855,7 +797,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l de -n German -X -M
%langpack -l dz -n Dzongkha -s ctl
%langpack -l el -n Greek -m el_GR
%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M
%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US
%langpack -l eo -n Esperanto
%langpack -l es -n Spanish -M -X
%langpack -l et -n Estonian -m et_EE
@@ -886,16 +828,16 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l nr -n Southern_Ndebele
%langpack -l nso -n Northern_Sotho
%langpack -l or -n Odia -s ctl
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN
%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN
%langpack -l pl -n Polish -X -m pl_PL
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X
%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR
%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT
%langpack -l ro -n Romanian -M -X
%langpack -l ru -n Russian -X -m ru_RU
%langpack -l si -n Sinhalese -S ctl -m si_LK
%langpack -l sk -n Slovak -X -m sk_SK
%langpack -l sl -n Slovenian -X -m sl_SI
%langpack -l sr -n Serbian -i sr-Latn -M
%langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin
%langpack -l ss -n Swati
%langpack -l st -n Southern_Sotho
%langpack -l sv -n Swedish -X -m sv_SE
@@ -908,8 +850,8 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l uk -n Ukrainian -m uk_UA
%langpack -l ve -n Venda
%langpack -l xh -n Xhosa
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant
%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN
%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW
%langpack -l zu -n Zulu -m zu_ZA
%prep
@@ -1122,21 +1064,18 @@ for dir in `find %{buildroot}/%{_datadir}/icons/gnome -type d` ; do
done
echo "%dir %{_datadir}/application-registry" >>file-lists/common_list.txt
echo "%dir %{_datadir}/mime-info" >>file-lists/common_list.txt
echo "%dir %{_datadir}/mimelnk" >>file-lists/common_list.txt
echo "%dir %{_datadir}/mimelnk/application" >>file-lists/common_list.txt
#################################
# Move split noarch data to share
#################################
for i in %{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/*.zip \
%{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/*/ui/res/*.zip \
for i in %{buildroot}%{_libdir}/%{name}/program/resource/*/*/*.mo \
%{buildroot}%{_libdir}/%{name}/share/registry/res/fcfg_langpack_*.xcd \
%{buildroot}%{_libdir}/%{name}/share/registry/res/registry_*.xcd \
%{buildroot}%{_libdir}/%{name}/share/registry/Langpack-*.xcd \
%{buildroot}%{_libdir}/%{name}/program/resource/*.res \
%{buildroot}%{_libdir}/%{name}/share/config/images*.zip \
%{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \
%{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_th.xcd \
%{buildroot}%{_libdir}/%{name}/share/wizards/*.properties \
; do
trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`"
mkdir -p "$trg"
@@ -1159,6 +1098,11 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/share/autotext/
grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist
mv tmplist file-lists/common_list.txt
mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/
# translations of java apps should be in lang pkgs too
grep -v '%{_libdir}/%{name}/share/wizards' file-lists/common_list.txt > tmplist
mv tmplist file-lists/common_list.txt
# the sr is dupe of sr_Latn
rm -rf %{buildroot}%{datadir}/%{name}/share/wizards/resources_sr.properties
################
# branding split
@@ -1343,11 +1287,7 @@ exit 0
%postun writer
%desktop_database_postun
%_link_noarch_files icon-theme-breeze
%_link_noarch_files icon-theme-galaxy
%_link_noarch_files icon-theme-hicontrast
%_link_noarch_files icon-theme-sifr
%_link_noarch_files icon-theme-tango
%_link_noarch_files icon-themes
%files -f file-lists/common_list.txt
# ignore helper files for brp-symlink check
@@ -1448,36 +1388,17 @@ exit 0
%files writer-extensions
%{_libdir}/%{name}/share/extensions/wiki-publisher
%files icon-theme-breeze
%files icon-themes
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_breeze.zip
%{_datadir}/%{name}/share/config/images_breeze_dark.zip
%files icon-theme-galaxy
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_elementary.zip
%{_datadir}/%{name}/share/config/images_galaxy.zip
%files icon-theme-hicontrast
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_hicontrast.zip
%files icon-theme-sifr
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_sifr.zip
%{_datadir}/%{name}/share/config/images_sifr_dark.zip
%files icon-theme-tango
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_tango.zip
%files -f file-lists/branding_upstream.txt branding-upstream