rpms/openoffice.org/devel openoffice.org-1.9.130.ooo54708.sc.patch, 1.5, 1.6 openoffice.org.spec, 1.486, 1.487

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3192

Modified Files:
	openoffice.org-1.9.130.ooo54708.sc.patch openoffice.org.spec 
Log Message:
foo

openoffice.org-1.9.130.ooo54708.sc.patch:
 addin/datefunc/makefile.mk                 |    0 
 addin/rot13/makefile.mk                    |    0 
 docs/readme.xsl                            |    0 
 filter/source/config/fragments/makefile.mk |    6 +++---
 readlicense_oo/docs/readme.xsl             |    2 +-
 readlicense_oo/util/makefile.pmk           |   12 ++++--------
 sc/addin/datefunc/makefile.mk              |    2 +-
 sc/addin/rot13/makefile.mk                 |    2 +-
 sc/util/makefile.mk                        |    3 ++-
 source/config/fragments/makefile.mk        |    0 
 source/intro/makefile.mk                   |    0 
 svx/source/intro/makefile.mk               |    1 +
 sw/util/makefile.mk                        |    1 +
 util/makefile.mk                           |    0 
 util/makefile.pmk                          |    0 
 15 files changed, 14 insertions(+), 15 deletions(-)

Index: openoffice.org-1.9.130.ooo54708.sc.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.130.ooo54708.sc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.130.ooo54708.sc.patch	21 Sep 2005 11:11:16 -0000	1.5
+++ openoffice.org-1.9.130.ooo54708.sc.patch	21 Sep 2005 14:59:56 -0000	1.6
@@ -125,7 +125,7 @@
  SHL3IMPLIB= swuiimp
  SHL3VERSIONMAP= swui.map
  SHL3DEF=$(MISC)$/$(SHL3TARGET).def
-+SHL3DEPN=$(SHL1IMPLIB) $(SHL1TARGET)
++SHL3DEPN=$(SHL1TARGETN)
  DEF3NAME=       $(SHL3TARGET)
  
  SHL3STDLIBS= \
@@ -141,7 +141,7 @@
  SHL8VERSIONMAP= scui.map
  SHL8DEF=$(MISC)$/$(SHL8TARGET).def
 -DEF8NAME=       $(SHL8TARGET)
-+SHL8DEPN=$(SHL1IMPLIB) $(SHL1TARGET)
++SHL8DEPN=$(SHL1TARGETN)
 +DEF8NAME=$(SHL8TARGET)
  
  SHL8STDLIBS= \


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- openoffice.org.spec	21 Sep 2005 13:02:33 -0000	1.486
+++ openoffice.org.spec	21 Sep 2005 14:59:56 -0000	1.487
@@ -95,9 +95,9 @@
 %if %{langpacks}
 %define langpack_core af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu
 %if %{galangpack}
-%define langpack_langs langpack_core ga
+%define langpack_langs %{langpack_core} ga
 %else
-%define langpack_langs langpack_core
+%define langpack_langs %{langpack_core}
 %endif
 %else
 %define langpack_langs en-US