[libreoffice-voikko] Don't use Arched BR: as written in Guidelines
paragn
paragn at fedoraproject.org
Wed Aug 7 04:45:04 UTC 2013
commit 49357fd509602245131008edaacfee90b62224ba
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Wed Aug 7 10:14:44 2013 +0530
Don't use Arched BR: as written in Guidelines
- fix build failure as cpumaker dropped -BURC option
libreoffice-voikko.spec | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/libreoffice-voikko.spec b/libreoffice-voikko.spec
index 305306b..e20cb73 100644
--- a/libreoffice-voikko.spec
+++ b/libreoffice-voikko.spec
@@ -1,6 +1,14 @@
+%global libo_version 4.0
+%global libo %{_libdir}/libreoffice
+%global libo_sdk %{libo}/sdk
+
+# The location of the installed extension. Apparently the directory name must
+# end with .uno.pkg or unopkg will fail.
+%global voikkoext %{libo}/share/extensions/voikko.uno.pkg
+
Name: libreoffice-voikko
Version: 3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Finnish spellchecker and hyphenator extension for LibreOffice
Group: Applications/Productivity
@@ -10,23 +18,15 @@ URL: http://voikko.sourceforge.net/
Source0: http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
# The usual format of test release URLs
#Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%global libo_version 4.0
-%global libo %{_libdir}/libreoffice
-%global libo_sdk %{libo}/sdk
-BuildRequires: libreoffice-sdk%{?_isa} >= %{libo_version}
-BuildRequires: libvoikko-devel%{?_isa}
+BuildRequires: libreoffice-sdk >= %{libo_version}
+BuildRequires: libvoikko-devel
Requires: libreoffice-core%{?_isa} >= %{libo_version}
+
# Renamed from openffice.org-voikko
Provides: openoffice.org-voikko = %{version}-%{release}
Obsoletes: openoffice.org-voikko < 3.1.2-6
-# The location of the installed extension. Apparently the directory name must
-# end with .uno.pkg or unopkg will fail.
-%define voikkoext %{libo}/share/extensions/voikko.uno.pkg
-
%description
This package contains a Finnish spell-checking and hyphenation component for
LibreOffice. The actual spell-checking and hyphenation functionality is
@@ -35,7 +35,7 @@ provided by the Voikko library.
%prep
%setup -q
-
+sed -i 's|-BUCR||g' Makefile
%build
. %{libo_sdk}/setsdkenv_unix.sh
@@ -45,7 +45,6 @@ provided by the Voikko library.
make extension-files "CC_FLAGS=-c -fpic -fvisibility=hidden" "OPT_FLAGS=$RPM_OPT_FLAGS" "COMP_LINK_FLAGS=-shared" %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
# This needs to be run every time before calling make
. %{libo_sdk}/setsdkenv_unix.sh
make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext}
@@ -53,17 +52,15 @@ make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext}
chmod +x $RPM_BUILD_ROOT%{voikkoext}/voikko.so
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%{voikkoext}
%doc ChangeLog COPYING README
-
%changelog
+* Wed Aug 07 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.4-3
+- Don't use Arched BR: as written in Guidelines
+- fix build failure as cpumaker dropped -BURC option
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list