rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80931.sysui.genericname.patch, NONE, 1.1 openoffice.org.spec, 1.1270, 1.1271

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18853

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo80931.sysui.genericname.patch 
Log Message:
have to add openoffice.org-2.3.0.ooo80931.sysui.genericname.patch if dropping the other hack

openoffice.org-2.3.0.ooo80931.sysui.genericname.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80931.sysui.genericname.patch ---
Index: desktop/share/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
retrieving revision 1.20
diff -u -r1.20 makefile.mk
--- openoffice.org.orig/sysui/desktop/share/makefile.mk	3 Jul 2007 12:58:02 -0000	1.20
+++ openoffice.org/sysui/desktop/share/makefile.mk	22 Aug 2007 08:23:44 -0000
@@ -148,7 +148,7 @@
 	@$(PERL) brand.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -u $(UNIXWRAPPERNAME) --iconprefix '$${{WITHOUTDOTUNIXPRODUCTNAME}}${ICONVERSION}-' $< $(@:db).$(INPATH)
 	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf
 	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf
-	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_comment.ulf
+	@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
 
 .IF "$(WITH_LIBSN)"=="YES"
 	@noop x$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -r1.1270 -r1.1271
--- openoffice.org.spec	23 Aug 2007 12:51:28 -0000	1.1270
+++ openoffice.org.spec	23 Aug 2007 13:03:42 -0000	1.1271
@@ -129,6 +129,7 @@
 Patch64: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch65: workspace.dba23e.patch
 Patch66: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch67: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1069,6 +1070,7 @@
 %patch64 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch65 -p1 -b .workspace.dba23e.patch
 %patch66 -p1 -b .ooo80967.ucb.neon27.patch
+%patch67 -p1 -b .ooo80931.sysui.genericname.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2751,6 +2753,7 @@
 - add openoffice.org-2.3.0.ooo80967.ucb.neon27.patch and reenable neon
 - drop openoffice.org-1.9.97.rh156067.noversionedsysui.patch and do it
   differently
+- add openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
 
 * Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.1
 - Resolves: rhbz#251896 count from start of ctl sequence, not start of