[perl-OpenOffice-UNO: 3/3] Fix FTBFS on F-18+

[Paul Howarth]

commit bd6d0026e6e82d5da55921b927a7870152cac376
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Nov 9 22:00:19 2012 +0000

    Fix FTBFS on F-18+
    
    - Tweak Makefile.PL so we don't end up finding libsal_textenc when we're
      looking for libuno_sal
    - Don't rpm-provide UNO.so

 OpenOffice-UNO-0.07-libraries.patch |   13 +++++++++++++
 perl-OpenOffice-UNO.spec            |   17 +++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/OpenOffice-UNO-0.07-libraries.patch b/OpenOffice-UNO-0.07-libraries.patch
new file mode 100644
index 0000000..16bb882
--- /dev/null
+++ b/OpenOffice-UNO-0.07-libraries.patch
@@ -0,0 +1,13 @@
+# Don't want to find libsal_textenc when we're really looking for libuno_sal
+
+--- Makefile.PL
++++ Makefile.PL
+@@ -129,7 +129,7 @@
+ ($sdk_ure_lib) = grep -f "$_/types.rdb", "$ENV{'OO_SDK_URE_BIN_DIR'}",
+                                          "$ENV{'OO_SDK_URE_HOME'}/share/misc";
+ 
+- at ReqLibs = ("cppuhelper", "cppu", "salhelper", "sal", "stlport", "gcc_s");
++ at ReqLibs = ("cppuhelper", "cppu", "salhelper", "uno_sal", "stlport", "gcc_s");
+ @LPath = ($uno_lib);
+ 
+ $LibsOK = 0;
diff --git a/perl-OpenOffice-UNO.spec b/perl-OpenOffice-UNO.spec
index eca60d7..02ebc4e 100644
--- a/perl-OpenOffice-UNO.spec
+++ b/perl-OpenOffice-UNO.spec
@@ -1,6 +1,6 @@
 Name:           perl-OpenOffice-UNO
 Version:        0.07
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Interface to OpenOffice's UNO run-time
 License:        LGPLv2+ and SISSL
 Group:          Development/Libraries
@@ -8,6 +8,7 @@ URL:            http://search.cpan.org/dist/OpenOffice-UNO/
 Source0:        http://www.cpan.org/authors/id/M/MB/MBARBON/OpenOffice-UNO-%{version}.tar.gz
 Patch0:         0001-Preserve-cflags.patch
 Patch1:         0001-Hardcode-rpath-to-uno-library.patch
+Patch2:         OpenOffice-UNO-0.07-libraries.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
@@ -22,6 +23,9 @@ BuildRequires:  libreoffice-calc
 BuildRequires:  libreoffice-headless
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# Don't provide UNO.so
+%{?perl_default_filter}
+
 %description
 A bridge to the OpenOffice.org API.
 
@@ -30,7 +34,7 @@ A bridge to the OpenOffice.org API.
 %setup -q -n OpenOffice-UNO-%{version}
 %patch0 -p1
 %patch1 -p1
-
+%patch2
 
 %build
 . $(find %{_libdir}/libreoffice -name setsdkenv_unix.sh -print -quit)
@@ -77,8 +81,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov  9 2012 Paul Howarth <paul at city-fan.org> - 0.07-6
+- Tweak Makefile.PL so we don't end up finding libsal_textenc when we're
+  looking for libuno_sal
+- Don't rpm-provide UNO.so
+
 * Wed Oct 31 2012 Tom Callaway <spot at fedoraproject.org> - 0.07-5
-- rebuild
+- Rebuild
 
 * Wed Aug 08 2012 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> 0.07-4
 - Forget OpenOffice.org
@@ -91,5 +100,5 @@ rm -rf $RPM_BUILD_ROOT
 - Correctly load SDK environment in fc18 (Petr Šabata, #788990)
 
 * Wed Feb 08 2012 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> 0.07-1
-- Specfile autogenerated by cpanspec 1.78.
+- Specfile autogenerated by cpanspec 1.78
 - Transmogrified