rpms/openoffice.org-voikko/devel openoffice.org-voikko.spec, 1.16, 1.17

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32146

Modified Files:
	openoffice.org-voikko.spec 
Log Message:
* Wed Feb 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0.1-2
- Rebuild for OOO310_m1
- No need to use a define for unopkg anymore



Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openoffice.org-voikko.spec	21 Jan 2009 16:13:16 -0000	1.16
+++ openoffice.org-voikko.spec	18 Feb 2009 18:22:26 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
 Version:        3.0.1 
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -12,19 +12,18 @@
 #Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    openoffice.org-sdk >= 1:3.0.1
+BuildRequires:    openoffice.org-sdk >= 1:3.1.0
 BuildRequires:    libvoikko-devel >= 2.0
-Requires(pre):    openoffice.org-core >= 1:3.0.1
-Requires(post):   openoffice.org-core >= 1:3.0.1
-Requires(preun):  openoffice.org-core >= 1:3.0.1
-Requires(postun): openoffice.org-core >= 1:3.0.1
+Requires(pre):    openoffice.org-core >= 1:3.1.0
+Requires(post):   openoffice.org-core >= 1:3.1.0
+Requires(preun):  openoffice.org-core >= 1:3.1.0
+Requires(postun): openoffice.org-core >= 1:3.1.0
 # Rpmbuild only detects libvoikko.so.1 automatically, which is
 # too general for openoffice.org-voikko.
 Requires:         libvoikko >= 2.0
 
-%define ooo_sdk %{_libdir}/openoffice.org/basis3.0/sdk
+%define ooo_sdk %{_libdir}/openoffice.org/basis3.1/sdk
 %define ooo %{_libdir}/openoffice.org
-%define unopkg %{_libdir}/openoffice.org3/program/unopkg
 # The location of the installed extension. Apparently the directory name must
 # end with .uno.pkg or unopkg will fail.
 %define voikkoext %{ooo}/extensions/voikko.uno.pkg
@@ -56,22 +55,22 @@
 %pre
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    %{unopkg} remove --shared org.puimula.ooovoikko || :
+    unopkg remove --shared org.puimula.ooovoikko || :
 fi
 
 %post
     # register extension
-    %{unopkg} add --shared --force --link %{voikkoext} || :
+    unopkg add --shared --force --link %{voikkoext} || :
 
 %preun
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    %{unopkg} remove --shared org.puimula.ooovoikko || :
+    unopkg remove --shared org.puimula.ooovoikko || :
 fi
 
 %postun
     # clear disk cache
-    %{unopkg} list --shared > /dev/null 2>&1 || :
+    unopkg list --shared > /dev/null 2>&1 || :
 
 
 %clean
@@ -85,6 +84,10 @@
 
 
 %changelog
+* Wed Feb 18 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0.1-2
+- Rebuild for OOO310_m1
+- No need to use a define for unopkg anymore
+
 * Wed Jan 21 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0.1-1
 - openoffice.org-voikko 3.0.1
 - Drop integrated OOO 3.0.1 compatibility patch