rpms/openoffice.org-extendedPDF/devel openoffice.org-extendedPDF-1.4.0-oooVersion.patch, NONE, 1.1 openoffice.org-extendedPDF.spec, 1.2, 1.3

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/openoffice.org-extendedPDF/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12099/devel

Modified Files:
	openoffice.org-extendedPDF.spec 
Added Files:
	openoffice.org-extendedPDF-1.4.0-oooVersion.patch 
Log Message:
* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-5
- Add patch to fix bug #495777


openoffice.org-extendedPDF-1.4.0-oooVersion.patch:

--- NEW FILE openoffice.org-extendedPDF-1.4.0-oooVersion.patch ---
--- extendedPDF/pdfm.xba.oooVersion	2006-08-11 10:51:02.000000000 -0600
+++ extendedPDF/pdfm.xba	2009-04-14 15:58:53.000000000 -0600
@@ -332,7 +332,7 @@
 	
 	' Subject property changes between OOo 1 and 2. Use of GetSolarVersion
 	' fix by James Holgate.
-	if GetSolarVersion < 646 then 'openoffice.org version 1.x.x or equivalent
+	if left(oooVersion, 3) = "1.0" or left(oooVersion, 3) = "1.1" then 'openoffice.org version 1.x.x or equivalent
         ' Thanks to Petr Ferdus for finding the right property here
         if not isNull(documentInfo.theme) and not isEmpty(documentInfo.theme) then
             s = s & " /Subject " & epdf_pdfu_hexEncodePdfText(documentInfo.theme, errorCode)


Index: openoffice.org-extendedPDF.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-extendedPDF/devel/openoffice.org-extendedPDF.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-extendedPDF.spec	26 Feb 2009 08:40:07 -0000	1.2
+++ openoffice.org-extendedPDF.spec	14 Apr 2009 22:09:05 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           openoffice.org-extendedPDF
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Create PDF with hyperlinks, bookmarks and more
 
 Group:          Applications/Productivity
@@ -13,6 +13,8 @@
 # rm extendedPDF-Universal-Edition/itext.jar
 # zip extendedPDF-Universal-Edition-1.4.0-CLEAN.zip -r extendedPDF-Universal-Edition
 Source0:        extendedPDF-Universal-Edition-1.4.0-CLEAN.zip
+# Gotten from http://bugzilla.neooffice.org/bug.php?op=show&bugid=1354
+Patch0:         openoffice.org-extendedPDF-1.4.0-oooVersion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires(pre):    openoffice.org-core
@@ -46,6 +48,11 @@
 tr -d '\r' < COPYING.txt > COPYING.txt.unix
 touch -r COPYING.txt COPYING.txt.unix
 mv COPYING.txt.unix COPYING.txt
+mkdir %{extname}.unpack
+pushd %{extname}.unpack
+unzip ../extendedPDF.zip
+%patch0 -p0
+
 
 
 %build
@@ -53,10 +60,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
-unzip %{extname} -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/
+cp -a %{extname}.unpack $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}
 #Is empty
 rm $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname}/mimetype
+# Cleanup patch backups
+find $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/%{extname} -name \*.orig -exec rm '{}' \;
 
 
 %clean
@@ -91,6 +100,9 @@
 
 
 %changelog
+* Tue Apr 14 2009 Orion Poplawski <orion at cora.nwra.com> 1.4-6
+- Add patch to fix bug #495777
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild