fix rhel-6 patches

libreoffice-rhel6gcj.patch

@@ -11,8 +11,8 @@
 --- a/odk/CustomTarget_javadoc.mk
 +++ b/odk/CustomTarget_javadoc.mk
 @@ -40,7 +40,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g
- 		-linkoffline ../../common/reg $(SRCDIR)/odk/pack/gendocu/uno \
- 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \
+ 		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
+ 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
  		$(odk_JAVAPACKAGES) \
 -		$(if $(JAVADOCISGJDOC),,-notimestamp) \
  		> $@
@@ -20,16 +20,14 @@
  # vim: set noet sw=4 ts=4:
 --- a/odk/Package_javadoc.mk
 +++ b/odk/Package_javadoc.mk
-@@ -20,12 +20,6 @@
+@@ -20,10 +20,5 @@
  	com/sun/star/comp/helper/ComponentContextEntry.html \
  	com/sun/star/comp/helper/SharedLibraryLoader.html \
- 	com/sun/star/comp/helper/UnoInfo.html \
 -	com/sun/star/comp/helper/class-use/Bootstrap.html \
 -	com/sun/star/comp/helper/class-use/BootstrapException.html \
 -	com/sun/star/comp/helper/class-use/ComponentContext.html \
 -	com/sun/star/comp/helper/class-use/ComponentContextEntry.html \
 -	com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \
--	com/sun/star/comp/helper/class-use/UnoInfo.html \
  	com/sun/star/comp/helper/package-frame.html \
  	com/sun/star/comp/helper/package-summary.html \
  	com/sun/star/comp/helper/package-tree.html \

libreoffice-rhel6poppler.patch

@@ -15,24 +15,19 @@
 -        CPPFLAGS=$save_CPPFLAGS
 -        AC_LANG_POP([C++])
          libo_MINGW_CHECK_DLL([libpoppler])
+         POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
      else
-       AC_MSG_RESULT([internal])
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-11-10 13:22:11.949473646 +0000
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-11-10 13:23:24.889473889 +0000
-@@ -64,16 +64,7 @@
+@@ -64,11 +64,6 @@
  class GfxPath;
  class GfxFont;
  class PDFDoc;
--#ifndef SYSTEM_POPPLER
- #define POPPLER_CHECK_VERSION(major,minor,micro) (0)
--typedef GString GooString;
--#else
 -#include <cpp/poppler-version.h>
 -#define POPPLER_CHECK_VERSION(major,minor,micro) \
 -  (POPPLER_VERSION_MAJOR > (major) || \
 -   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
 -   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
--#endif
  
  namespace pdfi
  {