rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.12, 1.13 openoffice.org.spec, 1.2036, 1.2037

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
ditch dtrans

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
 scripts/soffice.sh |   12 +++--------
 util/makefile.mk   |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 8 deletions(-)

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	12 Oct 2009 08:59:27 -0000	1.12
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	14 Oct 2009 08:07:26 -0000	1.13
@@ -37,7 +37,7 @@
  if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
 --- desktop.orig/util/makefile.mk	2009-10-12 08:41:17.000000000 +0100
 +++ desktop/util/makefile.mk	2009-10-12 09:52:19.000000000 +0100
-@@ -189,6 +189,61 @@
+@@ -189,6 +189,60 @@
  APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
  APP5DEF=    $(MISCX)$/$(TARGET).def
  
@@ -55,7 +55,6 @@
 +    $(REGLIB) \
 +    -lvclplug_gtk$(DLLPOSTFIX) \
 +    -lvclplug_gen$(DLLPOSTFIX) \
-+    -ldtrans \
 +    $(LNGLIB) \
 +    $(ICUINLIB)
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -p -r1.2036 -r1.2037
--- openoffice.org.spec	13 Oct 2009 19:29:51 -0000	1.2036
+++ openoffice.org.spec	14 Oct 2009 08:07:26 -0000	1.2037
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4123,6 +4123,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-1.2
+- don't link against dtrans, not needed anymore
+
 * Tue Oct 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
 - drop integrated autocorrection files (i102567)
 - drop integrated workspace.defaultdoclang.patch