rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101152.solenv.kn.patch, NONE, 1.1 openoffice.org-simple-crash_report.sh, 1.11, 1.12 openoffice.org.spec, 1.1879, 1.1880

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16605/F-11

Modified Files:
	openoffice.org-simple-crash_report.sh openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101152.solenv.kn.patch 
Log Message:
Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch

openoffice.org-3.1.0.ooo101152.solenv.kn.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101152.solenv.kn.patch ---
diff -ru solenv.orig/inc/postset.mk solenv/inc/postset.mk
--- openoffice.org.orig/solenv/inc/postset.mk	2009-04-17 08:55:49.000000000 +0100
+++ openoffice.org/solenv/inc/postset.mk	2009-04-17 08:56:21.000000000 +0100
@@ -35,6 +35,6 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu-IN he hi-IN hr hu it ja ka kk km kn-IN ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))


Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-simple-crash_report.sh	17 Sep 2008 22:04:13 -0000	1.11
+++ openoffice.org-simple-crash_report.sh	17 Apr 2009 08:04:58 -0000	1.12
@@ -6,6 +6,9 @@
 filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
 echo "(I)    x.org loaded video driver of..." > $filename
 xlog=`(xset -q || echo "  Log file:     /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-`
+if [ -z $xlog ]; then
+  xlog="/var/log/Xorg.0.log"
+fi
 grep "drivers" $xlog >> $filename
 grep "pixmap format" $xlog >> $filename
 echo "(III)  Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
@@ -14,12 +17,15 @@
 echo "(VI)   kernel is:" `uname -s -r -v -m -p -i` >> $filename
 echo "(VII)  OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
 echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
+echo "(IX)   gtk theme is:" `gconftool-2 -g "/desktop/gnome/interface/gtk_theme"` >> $filename
+echo "(X)    icon theme is:" `gconftool-2 -g "/desktop/gnome/interface/icon_theme"` >> $filename
+echo "(XI)   metacity theme is:" `gconftool-2 -g "/apps/metacity/general/theme"` >> $filename
 if [ -e /etc/fedora-release ]; then
-echo "(IX)   fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(XII)  fedora release is:" `cat /etc/fedora-release` >> $filename
 elif [ -e /etc/redhat-release ]; then
-echo "(IX)   redhat release is:" `cat /etc/redhat-release` >> $filename
+echo "(XII)  redhat release is:" `cat /etc/redhat-release` >> $filename
 fi
-echo "(X)    LANG is: $LANG" >> $filename
+echo "(XIII) LANG is: $LANG" >> $filename
 echo "...start free space details ..." >> $filename
 df -k /home /tmp >> $filename
 echo "...end free space details ..." >> $filename


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1879
retrieving revision 1.1880
diff -u -r1.1879 -r1.1880
--- openoffice.org.spec	16 Apr 2009 19:46:44 -0000	1.1879
+++ openoffice.org.spec	17 Apr 2009 08:04:58 -0000	1.1880
@@ -25,7 +25,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk mai
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN uk mai
 %else
 %define langpack_langs en-US
 %endif
@@ -136,6 +136,7 @@
 Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
 Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1630,6 +1631,7 @@
 %patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
 %patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 %patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
+%patch64 -p1 -b .ooo101152.solenv.kn.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4123,9 +4125,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
+* Fri Apr 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.4
 - workaround rhbz#494817 
 - Resolves: rhbz#495840 openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
+- Resolves: rhbz#496197 openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 
 * Wed Apr 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch