Accepting request 224444 from LibreOffice:Factory
- set exclusivearch to x86/x86_64 - Fix the install phase. - Fix license tag to GPL-3.0+ or MIT and package COPYING and README (which states both licenses can apply). - Version bump to 3.7: * Needed to build with lo-4.2 and later * Also compatible with new libvoikko - Cleanup with spec-cleaner and remove useless defines. - Drop no longer needed patch: * libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff OBS-URL: https://build.opensuse.org/request/show/224444 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice-voikko?expand=0&rev=10
This commit is contained in:
commit
cfb9d14ce8
3
libreoffice-voikko-4.0.tar.gz
Normal file
3
libreoffice-voikko-4.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38dfdc2c299c9e538febde12b08a4544d1dd6b1da82e0f682f7457bd0975c89d
|
||||
size 36453
|
@ -1,13 +0,0 @@
|
||||
Index: libreoffice-voikko-rel-3.4.1/Makefile
|
||||
===================================================================
|
||||
--- libreoffice-voikko-rel-3.4.1.orig/Makefile
|
||||
+++ libreoffice-voikko-rel-3.4.1/Makefile
|
||||
@@ -236,7 +236,7 @@ $(patsubst %,build/oxt/%,$(STANDALONE_EX
|
||||
# Type library C++ headers
|
||||
build/hpp.flag:
|
||||
-$(MKDIR) build$(PS)hpp
|
||||
- $(CPPUMAKER) -Gc -BUCR -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
|
||||
+ $(CPPUMAKER) -Gc -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
|
||||
echo flagged > $@
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c342a93550b2e2d4734190bd4a130aa8bdf68987e941d57e15e203a67cc2568
|
||||
size 45640
|
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 27 10:53:07 UTC 2014 - fcrozat@suse.com
|
||||
|
||||
- set exclusivearch to x86/x86_64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 27 09:40:06 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Fix the install phase.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 11 10:22:36 UTC 2014 - fcrozat@suse.com
|
||||
|
||||
- Fix license tag to GPL-3.0+ or MIT and package COPYING and
|
||||
README (which states both licenses can apply).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 26 10:22:23 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Version bump to 3.7:
|
||||
* Needed to build with lo-4.2 and later
|
||||
* Also compatible with new libvoikko
|
||||
- Cleanup with spec-cleaner and remove useless defines.
|
||||
- Drop no longer needed patch:
|
||||
* libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 22 15:28:03 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice-voikko
|
||||
#
|
||||
# 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
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
|
||||
Name: libreoffice-voikko
|
||||
Version: 3.4.1
|
||||
Version: 4.0
|
||||
Release: 0
|
||||
Summary: LibreOffice spellchecker/hyphenator for finnish language
|
||||
License: GPL-3.0+
|
||||
License: MPL-2.0 or GPL-3.0+
|
||||
Group: Productivity/Text/Spell
|
||||
%define ooo_prefix %{_libdir}
|
||||
%define ooo_home libreoffice
|
||||
Url: http://voikko.puimula.org/
|
||||
Source: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: libreoffice >= 4.1
|
||||
@ -31,54 +31,37 @@ BuildRequires: libreoffice-sdk >= 4.1
|
||||
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(post): coreutils
|
||||
Requires(post): grep
|
||||
Requires(post): libreoffice >= 4.1
|
||||
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: %{name}-rel-%{version}.tar.bz2
|
||||
# -BUCR is gone in cppumaker upstream, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a8e8acd1f0cbb512868fd9849363f9d069db95.
|
||||
# Fix like upstream for javamaker (which had the same change) in http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f8015045cb59ff9574230530d371b6659697881
|
||||
Patch0: libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
|
||||
Provides: locale(OpenOffice_org:fi)
|
||||
Requires(postun): libreoffice >= 4.1
|
||||
Provides: locale(libreoffice:fi)
|
||||
# compat stuff
|
||||
Provides: OpenOffice_org-voikko = %{version}
|
||||
Obsoletes: OpenOffice_org-voikko <= %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
|
||||
%description
|
||||
LibreOffice spellchecker/hyphenator for finnish language, which uses
|
||||
libvoikko as backend.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-rel-%{version}
|
||||
%patch0 -p1
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
. %ooo_prefix/%ooo_home/sdk/setsdkenv_unix.sh
|
||||
make oxt
|
||||
. %{_libdir}/libreoffice/sdk/setsdkenv_unix.sh
|
||||
make oxt %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
||||
cd build
|
||||
voikkoPackage=$(pwd)/voikko.oxt
|
||||
mkdir -p %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko
|
||||
cd %{buildroot}%ooo_prefix/%ooo_home/share/extensions/voikko
|
||||
unzip "$voikkoPackage"
|
||||
voikko_pkg=$(pwd)/build/voikko.oxt
|
||||
mkdir -p %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
|
||||
cd %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
|
||||
unzip $voikko_pkg
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,0755)
|
||||
%ooo_prefix/%ooo_home/share/extensions/voikko
|
||||
%doc COPYING README
|
||||
%{_libdir}/libreoffice/share/extensions/voikko
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user