From b1c9bfc773947b0e4b4230c0a80ede6c7a8d9aa80cb355d6707f121b2a534993 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 17 Apr 2012 05:46:14 +0000 Subject: [PATCH] Accepting request 113368 from LibreOffice:Unstable - set license tag correctly to GPL-3.0+ (bnc#741551) - fix build with LibreOffice-3.5; basis directory does not longer exist - call unopkg-sync-bundled in %posttrans and %post to update extensions cache and make it actually working - spec file clean up - change license to be in spdx.org format - removed unused update-alternatives from BuildRequires OBS-URL: https://build.opensuse.org/request/show/113368 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice-voikko?expand=0&rev=5 --- libreoffice-voikko.changes | 23 +++++++++++++++ libreoffice-voikko.spec | 58 +++++++++++++++++++++++++++----------- 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes index 27f04db..be87ffd 100644 --- a/libreoffice-voikko.changes +++ b/libreoffice-voikko.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Apr 12 12:33:04 UTC 2012 - pmladek@suse.com + +- set license tag correctly to GPL-3.0+ (bnc#741551) + +------------------------------------------------------------------- +Mon Apr 2 13:07:21 UTC 2012 - pmladek@suse.com + +- fix build with LibreOffice-3.5; basis directory does not longer exist +- call unopkg-sync-bundled in %posttrans and %post to update extensions + cache and make it actually working +- spec file clean up + +------------------------------------------------------------------- +Thu Jan 12 11:30:45 UTC 2012 - coolo@suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- +Thu Mar 3 17:41:34 CET 2011 - pmladek@suse.cz + +- removed unused update-alternatives from BuildRequires + ------------------------------------------------------------------- Thu Feb 3 20:46:50 CET 2011 - pmladek@suse.cz diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec index e2a1b69..06d45c1 100644 --- a/libreoffice-voikko.spec +++ b/libreoffice-voikko.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-voikko # -# 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 @@ -16,45 +16,69 @@ # - Name: libreoffice-voikko -%define ooo_prefix %_libdir -%define ooo_home libreoffice -BuildRequires: gcc-c++ java-devel libreoffice libreoffice-sdk libvoikko-devel unzip update-alternatives zip -Summary: LibreOffice spellchecker/hyphenator for finnish language Version: 3.1.2 -Release: 1 -License: GPL +Release: 0 +Summary: LibreOffice spellchecker/hyphenator for finnish language +License: GPL-3.0+ Group: Productivity/Text/Spell -PreReq: libreoffice coreutils grep zip -Provides: locale(libreoffice:fi) locale(OpenOffice_org:fi) -# compat stuff -Provides: OpenOffice_org-voikko = %version -Obsoletes: OpenOffice_org-voikko <= %version +%define ooo_prefix %{_libdir} +%define ooo_home libreoffice +BuildRequires: gcc-c++ +BuildRequires: java-devel +BuildRequires: libreoffice >= 3.5 +BuildRequires: libreoffice-sdk >= 3.5 +BuildRequires: libvoikko-devel +BuildRequires: unzip +BuildRequires: zip +# post install scripts +%if 0%{?suse_version} > 01120 +Requires(post): coreutils +Requires(post): grep +Requires(post): libreoffice >= 3.5 +Requires(postun): coreutils +Requires(postun): grep +Requires(postun): libreoffice >= 3.5 +%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 01120 +PreReq: coreutils +PreReq: grep +PreReq: libreoffice +%endif Url: http://voikko.sourceforge.net Source: openoffice.org-voikko-%{version}.tar.bz2 +Provides: locale(OpenOffice_org:fi) +Provides: locale(libreoffice:fi) +# compat stuff +Provides: OpenOffice_org-voikko = %{version} +Obsoletes: OpenOffice_org-voikko <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description LibreOffice spellchecker/hyphenator for finnish language, which uses libvoikko as backend. - %prep %setup -q -n openoffice.org-voikko-%{version} %build -. %ooo_prefix/%ooo_home/basis-link/sdk/setsdkenv_unix.sh +. %ooo_prefix/%ooo_home/sdk/setsdkenv_unix.sh make oxt %install cd build voikkoPackage=$(pwd)/voikko.oxt -mkdir -p $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extensions/voikko -cd $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/share/extensions/voikko +mkdir -p %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko +cd %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko unzip "$voikkoPackage" +%posttrans +%{_sbindir}/unopkg-sync-bundled || true + +%postun +%{_sbindir}/unopkg-sync-bundled || true + %files %defattr(-,root,root,0755) %ooo_prefix/%ooo_home/share/extensions/voikko