From e8a978c4665440a234177201b84b81bd1a9f2c2c8f16513177e10dd6fcf7b015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Sat, 24 Aug 2013 08:14:44 +0000
Subject: [PATCH] Accepting request 196130 from LibreOffice:Factory

fix version of the used %patch macro (forwarded request 196129 from pmladek)

OBS-URL: https://build.opensuse.org/request/show/196130
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice-voikko?expand=0&rev=8
---
 ...ice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff | 13 ++++++++++++
 libreoffice-voikko-rel-3.4.1.tar.bz2          |  3 +++
 libreoffice-voikko.changes                    | 14 +++++++++++++
 libreoffice-voikko.spec                       | 20 +++++++++----------
 openoffice.org-voikko-3.1.2.tar.bz2           |  3 ---
 5 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
 create mode 100644 libreoffice-voikko-rel-3.4.1.tar.bz2
 delete mode 100644 openoffice.org-voikko-3.1.2.tar.bz2

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
new file mode 100644
index 0000000..15c84ca
--- /dev/null
+++ b/libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..236ae7f
--- /dev/null
+++ b/libreoffice-voikko-rel-3.4.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c342a93550b2e2d4734190bd4a130aa8bdf68987e941d57e15e203a67cc2568
+size 45640
diff --git a/libreoffice-voikko.changes b/libreoffice-voikko.changes
index be87ffd..710ec4b 100644
--- a/libreoffice-voikko.changes
+++ b/libreoffice-voikko.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Aug 22 15:28:03 UTC 2013 - pmladek@suse.com
+
+- updated to version 3.4.1:
+        * do not query available languages too often
+	* support for spell checking multiple languages
+	* English as the fallback language for settings dialog
+- bumped dependencies in LibreOffice; documentation said that it built
+  and worked only with LO 4.1 and higher
+- libreoffice-voikko-rel-3.4.1-lo-4.1-cppumaker.diff: -BUCR is gone in
+  the upstream cppumaker
+- remove obsolete post install scripts; the system UNO cache is not
+  longer read by LO >= 4.0
+
 -------------------------------------------------------------------
 Thu Apr 12 12:33:04 UTC 2012 - pmladek@suse.com
 
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 06d45c1..41692c2 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libreoffice-voikko
-Version:        3.1.2
+Version:        3.4.1
 Release:        0
 Summary:        LibreOffice spellchecker/hyphenator for finnish language
 License:        GPL-3.0+
@@ -26,8 +26,8 @@ Group:          Productivity/Text/Spell
 %define         ooo_home           libreoffice
 BuildRequires:  gcc-c++
 BuildRequires:  java-devel
-BuildRequires:  libreoffice >= 3.5
-BuildRequires:  libreoffice-sdk >= 3.5
+BuildRequires:  libreoffice >= 4.1
+BuildRequires:  libreoffice-sdk >= 4.1
 BuildRequires:  libvoikko-devel
 BuildRequires:  unzip
 BuildRequires:  zip
@@ -46,7 +46,10 @@ PreReq:         grep
 PreReq:         libreoffice
 %endif
 Url:            http://voikko.sourceforge.net
-Source:         openoffice.org-voikko-%{version}.tar.bz2
+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)
 Provides:       locale(libreoffice:fi)
 # compat stuff
@@ -59,7 +62,8 @@ LibreOffice spellchecker/hyphenator for finnish language, which uses
 libvoikko as backend.
 
 %prep
-%setup -q -n openoffice.org-voikko-%{version}
+%setup -q -n %{name}-rel-%{version}
+%patch0 -p1
 
 %build
 . %ooo_prefix/%ooo_home/sdk/setsdkenv_unix.sh
@@ -73,12 +77,6 @@ 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
diff --git a/openoffice.org-voikko-3.1.2.tar.bz2 b/openoffice.org-voikko-3.1.2.tar.bz2
deleted file mode 100644
index c45f473..0000000
--- a/openoffice.org-voikko-3.1.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a83b24738544912a8818c37b1c3976cdb124cd899dcd4e9fa6824757b1e90ede
-size 39292