[openoffice.org-diafilter/el6: 22/22] Merge branch 'master' into el6

[Caolán McNamara]

commit b395305c0f4672ca8dafd7cca2dbdd04d6dbcd26
Merge: 974509c dae891f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 27 11:33:38 2013 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	openoffice.org-diafilter.spec
    	sources

 .gitignore                    |    2 +-
 openoffice.org-diafilter.spec |  107 +++++++++++++++++++++++++++-------------
 sources                       |    2 +-
 3 files changed, 74 insertions(+), 37 deletions(-)
---
diff --cc openoffice.org-diafilter.spec
index abd5038,c873385..f389a93
--- a/openoffice.org-diafilter.spec
+++ b/openoffice.org-diafilter.spec
@@@ -1,65 -1,40 +1,56 @@@
- Name:           openoffice.org-diafilter
- Version:        1.7.0
- Release:        1%{?dist}
- Summary:        DIA diagram shape importer and gallery extension for OpenOffice.org
- Group:          Applications/Productivity
- License:        GPLv3+ and LGPLv3+
- 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
- 
- %define instdir %{_libdir}
- %define baseinstdir %{instdir}/openoffice.org
- %define basisinstdir %{baseinstdir}/basis3.2
- %define sdkinstdir %{baseinstdir}/basis3.2/sdk
+ %global instdir %{_libdir}
+ %global baseinstdir %{instdir}/libreoffice
+ %global sdkinstdir %{baseinstdir}/sdk
+ 
+ Name:          openoffice.org-diafilter
+ Version:       1.7.2
+ Release:       5%{?dist}
+ Summary:       DIA diagram shape importer and gallery extension for LibreOffice
+ Group:         Applications/Productivity
+ License:       GPLv3+ and LGPLv3+
+ 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: libreoffice-sdk, boost-devel, dia, zlib-devel, zip
+ Requires:      libreoffice-draw
  
  %description
- This package contains an importer component for OpenOffice.org to enable
- importing the "dia" diagram and shape formats. A gallery of the standard set of
- "dia" shapes are made available from Gallery for convenience.
+ This package contains an importer component for LibreOffice to enable importing
+ the "dia" diagram and shape formats. A gallery of the standard set of "dia"
+ shapes are made available from Gallery for convenience.
  
  %prep
  %setup -q
+ sed -i 's|-BUCR||g' Makefile
+ sed -i 's|valueOf(|number(|g'  src/shapefilter.cxx  src/diafilter.cxx src/basegfx/b2dsvgpolypolygon.cxx
  
 +%pre
 +if [ $1 -gt 1 ] ; then
 +unopkg remove --shared mcnamara.caolan.diafilter || :
 +fi
 +
 +%post
 +unopkg add --shared --force --link %{baseinstdir}/extensions/diafilter.oxt || :
 +
 +%preun
 +if [ $1 -eq 0 ] ; then
 +unopkg remove --shared mcnamara.caolan.diafilter || :
 +fi
 +
 +%postun
 +unopkg list --shared > /dev/null 2>&1 || :
 +
  %build
  . %{sdkinstdir}/setsdkenv_unix.sh
- DIA_SHAPES_DIR=/usr/share/dia/shapes make
+ OPT_FLAGS="$RPM_OPT_FLAGS" DIA_SHAPES_DIR=%{_datadir}/dia/shapes make %{?_smp_mflags}
  
  %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
- 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