[libreoffice] tweak -notimestamp patch for rhel6

Caolán McNamara caolanm at fedoraproject.org
Fri Mar 8 14:21:42 UTC 2013


commit dc9e3d05638bc1e66f65d07cffd0138a7bdbd367
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 8 14:21:39 2013 +0000

    tweak -notimestamp patch for rhel6

 libreoffice-rhel6gcj.patch |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libreoffice-rhel6gcj.patch b/libreoffice-rhel6gcj.patch
index a0df2fb..644f5d2 100644
--- a/libreoffice-rhel6gcj.patch
+++ b/libreoffice-rhel6gcj.patch
@@ -10,12 +10,13 @@
  #endif
 --- a/odk/pack/gendocu/makefile.mk
 +++ b/odk/pack/gendocu/makefile.mk
-@@ -59,7 +59,7 @@
-         $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
+@@ -60,9 +60,6 @@
          $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
  
--JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
-+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
+ JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+-.IF "$(JAVADOCISGJDOC)" != "yes"
+-JAVADOCPARAMS+= -notimestamp
+-.ENDIF
  
  JAVADOCLOG = $(MISC)$/javadoc_log.txt
  


More information about the scm-commits mailing list