[openoffice.org-diafilter: 1/2] rebuild for libreoffice

[Caolan McNamara]

commit 84967404ed827a48183ff7278e4efd974aac48d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 23 20:52:16 2010 +0100

    rebuild for libreoffice

 openoffice.org-diafilter.spec |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/openoffice.org-diafilter.spec b/openoffice.org-diafilter.spec
index d9c8c8c..7aa9415 100644
--- a/openoffice.org-diafilter.spec
+++ b/openoffice.org-diafilter.spec
@@ -1,6 +1,6 @@
 Name:           openoffice.org-diafilter
 Version:        1.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        DIA diagram shape importer and gallery extension for OpenOffice.org
 Group:          Applications/Productivity
 License:        GPLv3+ and LGPLv3+
@@ -8,15 +8,11 @@ URL:            http://fedorahosted.org/openoffice.org-diafilter
 Source:         http://fedorahosted.org/releases/o/p/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:    openoffice.org-sdk >= 1:3.0.0, boost-devel, dia
-Requires(pre):    openoffice.org-core >= 1:3.0.0
-Requires(post):   openoffice.org-core >= 1:3.0.0
-Requires(preun):  openoffice.org-core >= 1:3.0.0
-Requires(postun): openoffice.org-core >= 1:3.0.0
-Requires:         openoffice.org-draw >= 1:3.0.0
+BuildRequires:    libreoffice >= 1:3.0.0, boost-devel, dia
+Requires:         libreoffice-draw >= 1:3.0.0
 
 %define instdir %{_libdir}
-%define baseinstdir %{instdir}/openoffice.org
+%define baseinstdir %{instdir}/libreoffice
 %define basisinstdir %{baseinstdir}/basis3.3
 %define sdkinstdir %{baseinstdir}/basis3.3/sdk
 
@@ -34,8 +30,8 @@ OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" DIA_SHAPES_DIR=/usr/share/dia/sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/diafilter.oxt $RPM_BUILD_ROOT/%{_datadir}/applications
-unzip -q build/diafilter.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/diafilter.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/diafilter.oxt $RPM_BUILD_ROOT/%{_datadir}/applications
+unzip -q build/diafilter.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/share/extensions/diafilter.oxt
 cp -p openoffice.org-diafilter.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-diafilter.desktop
 
 %clean
@@ -43,11 +39,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{baseinstdir}/extensions/diafilter.oxt
+%{baseinstdir}/share/extensions/diafilter.oxt
 %{_datadir}/applications/openoffice.org-diafilter.desktop
 %doc README NEWS TODO gpl-3.0.txt lgpl-3.0.txt
 
 %changelog
+* Sat Oct 23 2010 Caolán McNamara <caolanm at redhat.com> - 1.7.0-3
+- rebuild for libreoffice
+
 * Sat Sep 18 2010 Caolán McNamara <caolanm at redhat.com> - 1.7.0-2
 - Resolves: rhbz#635286 build with $RPM_OPT_FLAGS