[openoffice.org-voikko] Fix macros Drop explicit libvoikko Requires and add the _isa macro to all libreoffice Requires.
Ville-Pekka Vainio
vpv at fedoraproject.org
Sat Sep 24 21:19:31 UTC 2011
commit 507a374d8fc11dda89646fc437652d04b859bb20
Author: Ville-Pekka Vainio <vpvainio at iki.fi>
Date: Sun Sep 25 00:19:11 2011 +0300
Fix macros
Drop explicit libvoikko Requires and add the _isa macro to all libreoffice
Requires.
openoffice.org-voikko.spec | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/openoffice.org-voikko.spec b/openoffice.org-voikko.spec
index 84c4851..7ad7724 100644
--- a/openoffice.org-voikko.spec
+++ b/openoffice.org-voikko.spec
@@ -1,6 +1,6 @@
Name: openoffice.org-voikko
Version: 3.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Finnish spellchecker and hyphenator extension for LibreOffice
Group: Applications/Productivity
@@ -16,12 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%global libo %{_libdir}/libreoffice
%global libo_sdk %{libo}/basis%{libo_version}/sdk
-BuildRequires: libreoffice-sdk >= libo_version
-BuildRequires: libvoikko-devel >= 2.1
-Requires: libreoffice-core >= libo_version
-# Rpmbuild only detects libvoikko.so.1 automatically, which is
-# too general for openoffice.org-voikko.
-Requires: libvoikko >= 2.1
+BuildRequires: libreoffice-sdk%{?_isa} >= %{libo_version}
+BuildRequires: libvoikko-devel%{?_isa}
+Requires: libreoffice-core%{?_isa} >= %{libo_version}
# The location of the installed extension. Apparently the directory name must
# end with .uno.pkg or unopkg will fail.
@@ -62,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 24 2011 Ville-Pekka Vainio <vpvainio AT iki.fi> - 3.1.2-5
+- Fix macros
+- Drop explicit libvoikko Requires and add the _isa macro to all libreoffice
+ Requires.
+
* Tue Jul 19 2011 Ville-Pekka Vainio <vpvainio AT iki.fi> - 3.1.2-4
- Fix FTBFS (rhbz #716053)
- Update required LibreOffice version
More information about the scm-commits
mailing list