rpms/openoffice.org-voikko/devel openoffice.org-voikko.spec, 1.25, 1.26

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21519

Modified Files:
	openoffice.org-voikko.spec 
Log Message:
Rebuild for OpenOffice.org 3.3


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- openoffice.org-voikko.spec	22 Jan 2010 22:27:28 -0000	1.25
+++ openoffice.org-voikko.spec	14 Jul 2010 15:10:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
 Version:        3.1 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -14,17 +14,17 @@ Source0:        http://downloads.sourcef
 Patch0:         ooovoikko-svn-r3103-damaged-configuration-handling-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    openoffice.org-sdk >= 1:3.2.0
+BuildRequires:    openoffice.org-sdk >= 1:3.3.0
 BuildRequires:    libvoikko-devel >= 2.1
-Requires(pre):    openoffice.org-core >= 1:3.2.0
-Requires(post):   openoffice.org-core >= 1:3.2.0
-Requires(preun):  openoffice.org-core >= 1:3.2.0
-Requires(postun): openoffice.org-core >= 1:3.2.0
+Requires(pre):    openoffice.org-core >= 1:3.3.0
+Requires(post):   openoffice.org-core >= 1:3.3.0
+Requires(preun):  openoffice.org-core >= 1:3.3.0
+Requires(postun): openoffice.org-core >= 1:3.3.0
 # Rpmbuild only detects libvoikko.so.1 automatically, which is
 # too general for openoffice.org-voikko.
 Requires:         libvoikko >= 2.1
 
-%define ooo_sdk %{_libdir}/openoffice.org/basis3.2/sdk
+%define ooo_sdk %{_libdir}/openoffice.org/basis3.3/sdk
 %define ooo %{_libdir}/openoffice.org
 # The location of the installed extension. Apparently the directory name must
 # end with .uno.pkg or unopkg will fail.
@@ -57,24 +57,10 @@ chmod +x $RPM_BUILD_ROOT%{voikkoext}/voi
 
 %pre
 if [ $1 -gt 1 ]; then
-    # Upgrade => deregister old extension
+    # Upgrade => deregister old < 3.3 extension
     unopkg remove --shared org.puimula.ooovoikko || :
 fi
 
-%post
-    # register extension
-    unopkg add --shared --force --link %{voikkoext} || :
-
-%preun
-if [ $1 -eq 0 ]; then
-    # not upgrading => deregister
-    unopkg remove --shared org.puimula.ooovoikko || :
-fi
-
-%postun
-    # clear disk cache
-    unopkg list --shared > /dev/null 2>&1 || :
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 14 2010 Caolán McNamara <caolanm at redhat.com> - 3.1-4
+- Rebuild for OpenOffice.org 3.3
+
 * Fri Jan 22 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.1-3
 - Add patch from SVN to partly fix broken configuration handling, which
   may lead to an OO.o crash (rhbz#549289)
@@ -187,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jan 21 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-0.2
 - Make one define a bit cleaner
-- Changes by Caolan McNamara:
+- Changes by Caolán McNamara:
   - Unpack the component at install time
   - Make a non-empty debuginfo package
   - Install the extension to /usr/lib/