rpms/openoffice.org-voikko/devel openoffice.org-voikko.spec, 1.3, 1.4

[Ville-Pekka Vainio (vpv)]

Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29840

Modified Files:
	openoffice.org-voikko.spec 
Log Message:
New version, spec file cleanup


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-voikko.spec	11 Feb 2008 22:55:54 -0000	1.3
+++ openoffice.org-voikko.spec	17 Feb 2008 13:19:48 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           openoffice.org-voikko
 Version:        2.2 
-Release:        0.2.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net/
-Source0:        http://www.puimula.org/htp/testing/%{name}-2.2rc1.tar.gz
+Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openoffice.org-sdk >= 2.0.4 libvoikko-devel >= 1.5
@@ -46,43 +46,25 @@
 chmod +x $RPM_BUILD_ROOT%{voikkoext}/voikko.so
 
 
-# The TMP_HOME hack is taken from the Debian scripts by Teemu Likonen:
-# Registering program 'unopkg' writes things to $HOME/.openoffice* directory
-# (even with the '--shared' option). We must set $HOME to some temporary
-# directory so that these (root owned) files don't get written to the regular
-# user's HOME in case he/she runs this with sudo.
-
 %pre
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
-    export HOME="$TMP_HOME"
-    %{unopkg} remove --shared org.puimula.ooovoikko -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || :
-    rm -rf "$TMP_HOME"
+    %{unopkg} remove --shared org.puimula.ooovoikko || :
 fi
 
 %post
     # register extension
-    TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
-    export HOME="$TMP_HOME"
-    %{unopkg} add --shared --link %{voikkoext} -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || :
-    rm -rf "$TMP_HOME"
+    %{unopkg} add --shared --link %{voikkoext} || :
 
 %preun
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
-    export HOME="$TMP_HOME"
-    %{unopkg} remove --shared org.puimula.ooovoikko -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || :
-    rm -rf "$TMP_HOME"
+    %{unopkg} remove --shared org.puimula.ooovoikko || :
 fi
 
 %postun
     # clear disk cache
-    TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
-    export HOME="$TMP_HOME"
-    %{unopkg} list --shared -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 > /dev/null 2>&1 || :
-    rm -rf "$TMP_HOME"
+    %{unopkg} list --shared > /dev/null 2>&1 || :
 
 
 %clean
@@ -96,6 +78,11 @@
 
 
 %changelog
+* Sun Feb 17 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-1
+- Upstream released 2.2
+- Remove the "temporary $HOME hack" and all -env options, since unopkg has 
+  been patched to take care of all that
+
 * Tue Feb 12 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-0.2.rc1
 - Use the package name, not a Debian leftover environment variable as an mktemp
   template