From 59ad26c0047df03dec13fe2d8ff9ed7ebdf4f761497c5b7b9750a0cdce5a92f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 26 Jan 2014 10:23:31 +0000
Subject: [PATCH 1/5] - 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.
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice-voikko?expand=0&rev=5
---
libreoffice-voikko-4.0.tar.gz | 3 ++
...ice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff | 13 -----
libreoffice-voikko-rel-3.4.1.tar.bz2 | 3 --
libreoffice-voikko.changes | 8 +++
libreoffice-voikko.spec | 49 ++++++-------------
5 files changed, 26 insertions(+), 50 deletions(-)
create mode 100644 libreoffice-voikko-4.0.tar.gz
delete mode 100644 libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
delete mode 100644 libreoffice-voikko-rel-3.4.1.tar.bz2
diff --git a/libreoffice-voikko-4.0.tar.gz b/libreoffice-voikko-4.0.tar.gz
new file mode 100644
index 0000000..1674285
--- /dev/null
+++ b/libreoffice-voikko-4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38dfdc2c299c9e538febde12b08a4544d1dd6b1da82e0f682f7457bd0975c89d
+size 36453
diff --git a/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff b/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
deleted file mode 100644
index 15c84ca..0000000
--- a/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
+++ /dev/null
@@ -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 > $@
-
-
diff --git a/libreoffice-voikko-rel-3.4.1.tar.bz2 b/libreoffice-voikko-rel-3.4.1.tar.bz2
deleted file mode 100644
index 236ae7f..0000000
--- a/libreoffice-voikko-rel-3.4.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c342a93550b2e2d4734190bd4a130aa8bdf68987e941d57e15e203a67cc2568
-size 45640
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index 710ec4b..f952623 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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.
+
-------------------------------------------------------------------
Thu Aug 22 15:28:03 UTC 2013 - pmladek@suse.com
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 41692c2..2257c77 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -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+
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,30 +31,13 @@ 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
%description
@@ -62,23 +45,21 @@ 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"
+mkdir -p %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
+cd %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
+unzip voikko.oxt
%files
%defattr(-,root,root,0755)
-%ooo_prefix/%ooo_home/share/extensions/voikko
+%{_libdir}/libreoffice/share/extensions/voikko
%changelog
From d8c0b3cc187b6cee571332322816e98e56d7bbca8731fd08509fc8a8e0f611f0 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Wed, 19 Feb 2014 08:34:01 +0000
Subject: [PATCH 2/5] Accepting request 221807 from
home:fcrozat:branches:LibreOffice:Factory
- Fix license tag to GPL-3.0+ or MIT and package COPYING and
README (which states both licenses can apply).
OBS-URL: https://build.opensuse.org/request/show/221807
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice-voikko?expand=0&rev=6
---
libreoffice-voikko.changes | 6 ++++++
libreoffice-voikko.spec | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index f952623..e9b7da1 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 2257c77..0e08124 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -20,7 +20,7 @@ Name: libreoffice-voikko
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
Url: http://voikko.puimula.org/
Source: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
@@ -60,6 +60,7 @@ unzip voikko.oxt
%files
%defattr(-,root,root,0755)
+%doc COPYING README
%{_libdir}/libreoffice/share/extensions/voikko
%changelog
From 2a15f244f7a210bcbbf38fdb72791270aa0d34e537857bec15e563ac8f9c9d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 27 Feb 2014 09:40:10 +0000
Subject: [PATCH 3/5] - Fix the install phase.
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice-voikko?expand=0&rev=7
---
libreoffice-voikko.changes | 5 +++++
libreoffice-voikko.spec | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index e9b7da1..970ac09 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 0e08124..890497d 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -53,10 +53,10 @@ make oxt %{?_smp_mflags}
%install
-cd build
+voikko_pkg=$(pwd)/build/voikko.oxt
mkdir -p %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
cd %{buildroot}%{_libdir}/libreoffice/share/extensions/voikko
-unzip voikko.oxt
+unzip $voikko_pkg
%files
%defattr(-,root,root,0755)
From 4b362256ca6504b55b429482653f57b326082d7b085de099a9b66adc6a918c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 27 Feb 2014 12:19:42 +0000
Subject: [PATCH 4/5] Accepting request 224085 from
home:fcrozat:branches:LibreOffice:Factory
- set exclusivearch to x86/x86_64
OBS-URL: https://build.opensuse.org/request/show/224085
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice-voikko?expand=0&rev=8
---
libreoffice-voikko.changes | 5 +++++
libreoffice-voikko.spec | 1 +
2 files changed, 6 insertions(+)
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index 970ac09..896d4d5 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 890497d..4af0534 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -39,6 +39,7 @@ Requires(postun): grep
Requires(postun): libreoffice >= 4.1
Provides: locale(libreoffice:fi)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch: %ix86 x86_64
%description
LibreOffice spellchecker/hyphenator for finnish language, which uses
From 47ba056022188b780f53f8716bc09d0e1c96a54900c4add3f0b7be8a224791b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 3 Mar 2014 13:11:14 +0000
Subject: [PATCH 5/5] - Drop no longer needed patch: *
libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice-voikko?expand=0&rev=9
---
libreoffice-voikko.changes | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index 896d4d5..ee311b7 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -21,6 +21,8 @@ Sun Jan 26 10:22:23 UTC 2014 - tchvatal@suse.com
* 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