commit 181910aa30dc1b0e19b24a8b91c7934f8db5ad09
Author: Tom Callaway <spot@xxxxxxxxxxxxxxxxx>
Date: Wed Oct 31 15:27:56 2012 -0400
rebuild
perl-OpenOffice-UNO.spec | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/perl-OpenOffice-UNO.spec b/perl-OpenOffice-UNO.spec
index 297db82..eca60d7 100644
--- a/perl-OpenOffice-UNO.spec
+++ b/perl-OpenOffice-UNO.spec
@@ -1,12 +1,6 @@
-%if 0%{?rhel} < 7 && 0%{?fedora} < 16
-%global soffice openoffice.org
-%else
-%global soffice libreoffice
-%endif
-
Name: perl-OpenOffice-UNO
Version: 0.07
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: Interface to OpenOffice's UNO run-time
License: LGPLv2+ and SISSL
Group: Development/Libraries
@@ -21,11 +15,11 @@ BuildRequires: perl(Cwd)
BuildRequires: perl(Exporter)
BuildRequires: perl(File::Path)
BuildRequires: /usr/bin/ooffice
-BuildRequires: %{soffice}-sdk >= 1:3
-BuildRequires: %{soffice}-sdk < 1:4
-BuildRequires: %{soffice}-writer
-BuildRequires: %{soffice}-calc
-BuildRequires: %{soffice}-headless
+BuildRequires: libreoffice-sdk >= 1:3
+BuildRequires: libreoffice-sdk < 1:4
+BuildRequires: libreoffice-writer
+BuildRequires: libreoffice-calc
+BuildRequires: libreoffice-headless
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
@@ -39,11 +33,11 @@ A bridge to the OpenOffice.org API.
%build
-. $(find %{_libdir}/%{soffice} -name setsdkenv_unix.sh -print -quit)
+. $(find %{_libdir}/libreoffice -name setsdkenv_unix.sh -print -quit)
# Auto-set bootstrap. Weird, but similar to what is done for python bindings.
awk '/bootstrap OpenOffice::UNO/ \
- {print "$ENV{URE_BOOTSTRAP} ||= \"vnd.sun.star.pathname:'$(echo %{_libdir}/%{soffice}*/program/fundamentalrc)'\";"}
+ {print "$ENV{URE_BOOTSTRAP} ||= \"vnd.sun.star.pathname:'$(echo %{_libdir}/libreoffice*/program/fundamentalrc)'\";"}
{print}' UNO.pm >UNO-bootstrap.pm
mv UNO-bootstrap.pm UNO.pm
@@ -64,7 +58,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%check
-setsid ooffice -headless -accept='socket,host=localhost,port=8100;urp;StarOffice.ServiceManager' &
+setsid ooffice --headless --accept='socket,host=localhost,port=8100;urp;StarOffice.ServiceManager' &
trap "kill -- -$! ||:" EXIT
sleep 10 # In fact, OpenOffice is known to start almost instanteously
make test
@@ -83,6 +77,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 31 2012 Tom Callaway <spot@xxxxxxxxxxxxxxxxx> - 0.07-5
+- rebuild
+
+* Wed Aug 08 2012 Lubomir Rintel (GoodData) <lubo.rintel@xxxxxxxxxxxx> 0.07-4
+- Forget OpenOffice.org
+- Forget what?
+
* Sat Feb 11 2012 Lubomir Rintel (GoodData) <lubo.rintel@xxxxxxxxxxxx> 0.07-3
- Add missing BRs, fix up the rpath patch (Petr Šabata, #788990)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
