rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch, NONE, 1.1 openoffice.org.spec, 1.2170, 1.2171

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8891/F-13

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch 
Log Message:
raptor helpfully breaks our help for us

openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch:
 librdf_repository.cxx |    5 +++++
 makefile.mk           |    8 ++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch ---
diff -r 21777680017e unoxml/source/rdf/librdf_repository.cxx
--- a/unoxml/source/rdf/librdf_repository.cxx	Thu Mar 18 17:15:13 2010 +0000
+++ b/unoxml/source/rdf/librdf_repository.cxx	Thu Apr 01 16:23:56 2010 +0100
@@ -52,6 +52,7 @@
 #include <rtl/ustring.hxx>
 
 #include <librdf.h>
+#include <libxslt/security.h>
 
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
@@ -1887,7 +1888,11 @@
             m_rRep);
     }
     //FIXME logger, digest, features?
+    xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs();
     librdf_world_open(pWorld);
+    xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs();
+    if (newprefs != origprefs)
+        xsltSetDefaultSecurityPrefs(origprefs);
     return pWorld;
 }
 
diff -r 21777680017e unoxml/source/rdf/makefile.mk
--- a/unoxml/source/rdf/makefile.mk	Thu Mar 18 17:15:13 2010 +0000
+++ b/unoxml/source/rdf/makefile.mk	Thu Apr 01 16:23:56 2010 +0100
@@ -41,6 +41,13 @@
 CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+CFLAGS+= $(LIBXSLT_CFLAGS)
+.ELSE
+LIBXSLTINCDIR=external$/libxslt
+CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
+.ENDIF
+
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
 
@@ -64,6 +71,7 @@
 
 SHL1STDLIBS= \
     $(REDLANDLIB) \
+    $(XSLTLIB) \
 	$(CPPUHELPERLIB) \
 	$(CPPULIB)	\
 	$(SALLIB) \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2170
retrieving revision 1.2171
diff -u -p -r1.2170 -r1.2171
--- openoffice.org.spec	15 Mar 2010 15:31:26 -0000	1.2170
+++ openoffice.org.spec	1 Apr 2010 15:43:13 -0000	1.2171
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -140,6 +140,7 @@ Patch69: workspace.vcl110.patch
 Patch70: openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch
 Patch71: openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch
 Patch72: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch73: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1712,6 +1713,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch70 -p0 -b .ooo109743.svx.safedragdrop.patch
 %patch71 -p0 -b .ooo109766.dbaccess.catch.patch
 %patch72 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch73 -p0 -b .ooo110523.rdf.resetsecprefs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4197,6 +4199,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 01 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.14
+- add openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
+
 * Mon Mar 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.13
 - Resolves: rhbz#573654 fix unwanted "Red" translation