rpms/openoffice.org/devel openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.97.rh156067.noversionedicons.patch 
Log Message:
rejig patch

openoffice.org-1.9.97.rh156067.noversionedicons.patch:
 desktop/redhat/makefile.mk       |    0 
 desktop/share/makefile.mk        |    0 
 sysui/desktop/redhat/makefile.mk |    3 ++-
 sysui/desktop/share/makefile.mk  |    3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.97.rh156067.noversionedicons.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.97.rh156067.noversionedicons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.97.rh156067.noversionedicons.patch	29 Apr 2005 13:52:57 -0000	1.1
+++ openoffice.org-1.9.97.rh156067.noversionedicons.patch	8 Jun 2005 15:16:47 -0000	1.2
@@ -1,10 +1,10 @@
 Index: desktop/redhat/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/sysui/desktop/redhat/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -r1.12 makefile.mk
---- openoffice.org.orig/sysui/desktop/redhat/makefile.mk	20 Apr 2005 11:35:49 -0000	1.12
-+++ openoffice.org/sysui/desktop/redhat/makefile.mk	29 Apr 2005 13:57:06 -0000
+retrieving revision 1.13
+diff -u -p -u -r1.13 makefile.mk
+--- openoffice.org.orig/sysui/desktop/redhat/makefile.mk	13 May 2005 09:28:19 -0000	1.13
++++ openoffice.org/sysui/desktop/redhat/makefile.mk	8 Jun 2005 15:18:52 -0000
 @@ -73,7 +73,8 @@ TARGET=redhat
  # --- Files --------------------------------------------------------
  
@@ -18,14 +18,14 @@
 Index: desktop/share/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -r1.4 makefile.mk
---- openoffice.org.orig/sysui/desktop/share/makefile.mk	28 Apr 2005 09:20:38 -0000	1.4
-+++ openoffice.org/sysui/desktop/share/makefile.mk	29 Apr 2005 13:57:07 -0000
-@@ -76,7 +76,8 @@ TARGET=desktopshare
- # --- Files --------------------------------------------------------
- 
- # GNOME does not like icon names with more than one '.'
+retrieving revision 1.5
+diff -u -p -u -r1.5 makefile.mk
+--- openoffice.org.orig/sysui/desktop/share/makefile.mk	6 Jun 2005 16:26:21 -0000	1.5
++++ openoffice.org/sysui/desktop/share/makefile.mk	8 Jun 2005 15:18:52 -0000
+@@ -79,7 +79,8 @@ TARGET=desktopshare
+ # even though the "icon_filename" in '.keys' is specified as filename 
+ # without extension. Since it alos does not know how to handle "9-writer"
+ # type icons :-), we are stripping all '.' for now.
 -ICONPREFIX = $(UNIXFILENAME:s/.//g)
 +#ICONPREFIX = $(UNIXFILENAME:s/.//g)
 +ICONPREFIX = openofficeorg