rpms/openoffice.org-voikko/F-8 .cvsignore, 1.2, 1.3 openoffice.org-voikko.spec, 1.3, 1.4 sources, 1.2, 1.3
Ville-Pekka Vainio (vpv)
fedora-extras-commits at redhat.com
Fri Apr 25 21:47:13 UTC 2008
Author: vpv
Update of /cvs/pkgs/rpms/openoffice.org-voikko/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3824
Modified Files:
.cvsignore openoffice.org-voikko.spec sources
Log Message:
Update according to the extension guidelines, new upstream version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 23 Jan 2008 19:24:40 -0000 1.2
+++ .cvsignore 25 Apr 2008 21:46:34 -0000 1.3
@@ -1 +1 @@
-openoffice.org-voikko-2.1.tar.gz
+openoffice.org-voikko-2.2.tar.gz
Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/F-8/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:39:06 -0000 1.3
+++ openoffice.org-voikko.spec 25 Apr 2008 21:46:34 -0000 1.4
@@ -1,6 +1,6 @@
Name: openoffice.org-voikko
-Version: 2.1
-Release: 3%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Finnish spellchecker and hyphenator extension for OpenOffice.org
Group: Applications/Productivity
@@ -9,21 +9,16 @@
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
-Requires(pre): openoffice.org-core
-Requires(post): openoffice.org-core
-Requires(preun): openoffice.org-core
-Requires(postun): openoffice.org-core
-Requires: openoffice.org-core >= 2.0.4 libvoikko >= 1.5
+BuildRequires: openoffice.org-sdk >= 2.3.0-6.12 libvoikko-devel >= 1.5
+Requires(pre): openoffice.org-core >= 2.3.0-6.12
+Requires(post): openoffice.org-core >= 2.3.0-6.12
+Requires(preun): openoffice.org-core >= 2.3.0-6.12
+Requires(postun): openoffice.org-core >= 2.3.0-6.12
%define oo2_sdk %{_libdir}/openoffice.org/sdk
%define oo2 %{_libdir}/openoffice.org
%define unopkg %{oo2}/program/unopkg
-%define voikkodir %{_libdir}/%{name}
-%define voikkoext %{_libdir}/%{name}/voikko.oxt
-
-# Can't make debug package as long as we need to install the .oxt file
-%define debug_package %{nil}
+%define voikkoext %{_libdir}/openoffice.org/extensions/voikko.uno.pkg
%description
This package contains a Finnish spell-checking and hyphenation component for
@@ -35,63 +30,45 @@
%setup -q
+# Make install-unpacked also builds before installing, leave the build section
+# empty.
%build
-. %{oo2_sdk}/setsdkenv_unix.sh
-make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-cd build
-voikkoPackage=$(pwd)/voikko.oxt;
-# OOo extension
-install -d -m 755 $RPM_BUILD_ROOT%{voikkodir}
-install -p -m 644 "$voikkoPackage" $RPM_BUILD_ROOT%{voikkodir}
-
-# The TMP_HOME trick 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.
+. %{oo2_sdk}/setsdkenv_unix.sh
+make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext} %{?_smp_mflags}
+# Set the library executable so debuginfo can be extracted.
+chmod +x $RPM_BUILD_ROOT%{voikkoext}/voikko.so
+
%pre
if [ $1 -gt 1 ]; then
# Upgrade => deregister old extension
- TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
- export HOME="$TMP_HOME"
# Clean up after a broken package version which left a broken package in
# unopkg
if %{unopkg} list --shared | grep -q 'Identifier: org.openoffice.legacy.voikko.uno.pkg'
then
- %{unopkg} remove --shared org.openoffice.legacy.voikko.uno.pkg -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || :
+ %{unopkg} remove --shared org.openoffice.legacy.voikko.uno.pkg || :
else
- %{unopkg} remove --shared org.puimula.ooovoikko -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 || :
+ %{unopkg} remove --shared org.puimula.ooovoikko || :
fi
- rm -rf "$TMP_HOME"
fi
%post
# register extension
- TMP_HOME="$(mktemp -t -d %{name}.XXXXXX)" || exit 1
- export HOME="$TMP_HOME"
- %{unopkg} add --shared %{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
@@ -100,11 +77,20 @@
%files
%defattr(-,root,root,-)
-%{voikkodir}
+%{voikkoext}
%doc ChangeLog COPYING README
%changelog
+* Sat Apr 25 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-1
+- Update the package to match the extension guidelines:
+ - Change location
+ - Update openoffice.org-* Requires
+ - Build the debuginfo package
+ - Remove the "temporary $HOME hack" and all -env options to unopkg
+- Update to the latest upstream version:
+ - Use the new install-unpacked make target
+
* Tue Feb 12 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.1-3
- Disable debuginfo package as long as we must install the .oxt file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 23 Jan 2008 19:24:40 -0000 1.2
+++ sources 25 Apr 2008 21:46:34 -0000 1.3
@@ -1 +1 @@
-f88a8cde8aea12c42fbdb63a85a284f0 openoffice.org-voikko-2.1.tar.gz
+830e6ed421f6d5eef19f3c4978b04da7 openoffice.org-voikko-2.2.tar.gz
More information about the fedora-extras-commits
mailing list