rpms/openoffice.org/devel openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 21 12:53:55 UTC 2005
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2590
Modified Files:
openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch
Log Message:
make patch to get verbose what is going on under ppc data
openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch:
desktop/freedesktop/makefile.mk | 0
desktop/mandrakelinux/makefile.mk | 0
desktop/redhat/makefile.mk | 0
desktop/suse/makefile.mk | 0
sysui/desktop/freedesktop/makefile.mk | 6 +++---
sysui/desktop/mandrakelinux/makefile.mk | 8 ++++----
sysui/desktop/redhat/makefile.mk | 8 ++++----
sysui/desktop/suse/makefile.mk | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
Index: openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch 4 Apr 2005 13:45:02 -0000 1.1
+++ openoffice.org-1.9.89.rhXXXXX.bastardingppcgivesillegalinstructionrandomly.sysui.patch 21 Apr 2005 12:53:52 -0000 1.2
@@ -1,15 +1,86 @@
-Index: prj/build.lst
+Index: desktop/freedesktop/makefile.mk
===================================================================
-RCS file: /cvs/gsl/sysui/prj/build.lst,v
-retrieving revision 1.30
-diff -u -p -r1.30 build.lst
---- openoffice.org.orig/sysui/prj/build.lst 8 Mar 2005 15:40:12 -0000 1.30
-+++ openoffice.org/sysui/prj/build.lst 4 Apr 2005 13:44:45 -0000
-@@ -7,7 +7,6 @@ su sysui\desktop\menus get - a
- su sysui\desktop\mimetypes get - all su_dtmime NULL
- su sysui\desktop\redhat nmake - u su_dtredhat su_dtshare.u NULL
- su sysui\desktop\suse nmake - u su_dtsuse su_dtshare.u NULL
--su sysui\desktop\mandrakelinux nmake - u su_dtmdk su_dtshare.u NULL
- su sysui\desktop\freedesktop nmake - u su_dtfreedesktop su_dtredhat.u NULL
- su sysui\desktop\cde nmake - u su_dtcde su_dtshare.u NULL
- su sysui\desktop\solaris nmake - u su_dtsolaris su_dtcde.u su_dtshare.u NULL
+RCS file: /cvs/gsl/sysui/desktop/freedesktop/makefile.mk,v
+retrieving revision 1.3
+diff -u -p -r1.3 makefile.mk
+--- openoffice.org.orig/sysui/desktop/freedesktop/makefile.mk 15 Mar 2005 08:47:57 -0000 1.3
++++ openoffice.org/sysui/desktop/freedesktop/makefile.mk 21 Apr 2005 12:33:39 -0000
+@@ -89,8 +89,8 @@ ALLTAR : PACKAGE_RPM
+ # --- packaging ---------------------------------------------------
+
+ PACKAGE_RPM :
+- @$(MKDIRHIER) $(MISC)$/$(TARGET)
+- @$(MKDIRHIER) $(MISC)$/$(TARGET)$/BUILD
+- @$(RPM) --define "basedir $(shell pwd)" --define "unixfilename $(UNIXFILENAME)" --define "version $(PKGVERSION)" --define "release $(PKGREV)" --define "_rpmdir $(RPMDIR)" -bb freedesktop-menus.spec --define "source $(shell cd $(MISC)$/redhat; pwd)" --define "unique $(shell echo $$$$)" --define "_builddir $(shell $(MISC)$/$(TARGET)/BUILD; pwd)"
++ $(MKDIRHIER) $(MISC)$/$(TARGET)
++ $(MKDIRHIER) $(MISC)$/$(TARGET)$/BUILD
++ $(RPM) --define "basedir $(shell pwd)" --define "unixfilename $(UNIXFILENAME)" --define "version $(PKGVERSION)" --define "release $(PKGREV)" --define "_rpmdir $(RPMDIR)" -bb freedesktop-menus.spec --define "source $(shell cd $(MISC)$/redhat; pwd)" --define "unique $(shell echo $$$$)" --define "_builddir $(shell $(MISC)$/$(TARGET)/BUILD; pwd)"
+
+ .ENDIF
+Index: desktop/mandrakelinux/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/mandrakelinux/makefile.mk,v
+retrieving revision 1.2
+diff -u -p -r1.2 makefile.mk
+--- openoffice.org.orig/sysui/desktop/mandrakelinux/makefile.mk 8 Mar 2005 15:34:26 -0000 1.2
++++ openoffice.org/sysui/desktop/mandrakelinux/makefile.mk 21 Apr 2005 12:33:39 -0000
+@@ -251,11 +251,11 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
+ # --- packaging ---------------------------------------------------
+
+ $(RPMFILE) : $(RPMDEPN) $(TARGET)-menus.spec
+- @$(MKDIRHIER) $(@:d)
+- @cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
++ $(MKDIRHIER) $(@:d)
++ cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
+ -e "s/%ICONPREFIX/$(ICONPREFIX)/" -e "s/Version: .*/Version: $(PKGVERSION)/" \
+ -e "s/Release: .*/Release: $(PKGREV)/" > $(MISC)/$(TARGET)-menus.spec
+- @echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
+- @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
++ echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
++ $(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
+
+ .ENDIF
+Index: desktop/redhat/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/redhat/makefile.mk,v
+retrieving revision 1.11
+diff -u -p -r1.11 makefile.mk
+--- openoffice.org.orig/sysui/desktop/redhat/makefile.mk 23 Mar 2005 09:12:39 -0000 1.11
++++ openoffice.org/sysui/desktop/redhat/makefile.mk 21 Apr 2005 12:33:39 -0000
+@@ -252,11 +252,11 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
+ # --- packaging ---------------------------------------------------
+
+ $(RPMFILE) : $(RPMDEPN) $(TARGET)-menus.spec
+- @$(MKDIRHIER) $(@:d)
+- @cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
++ $(MKDIRHIER) $(@:d)
++ cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
+ -e "s/%ICONPREFIX/$(ICONPREFIX)/" -e "s/Version: .*/Version: $(PKGVERSION)/" \
+ -e "s/Release: .*/Release: $(PKGREV)/" > $(MISC)/$(TARGET)-menus.spec
+- @echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
+- @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
++ echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
++ $(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
+
+ .ENDIF
+Index: desktop/suse/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/sysui/desktop/suse/makefile.mk,v
+retrieving revision 1.12
+diff -u -p -r1.12 makefile.mk
+--- openoffice.org.orig/sysui/desktop/suse/makefile.mk 23 Mar 2005 09:12:54 -0000 1.12
++++ openoffice.org/sysui/desktop/suse/makefile.mk 21 Apr 2005 12:33:41 -0000
+@@ -252,10 +252,10 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) :
+
+ $(RPMFILE) : $(RPMDEPN) $(TARGET)-menus.spec
+ $(MKDIRHIER) $(@:d)
+- @cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
++ cat $(TARGET)-menus.spec | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" \
+ -e "s/%ICONPREFIX/$(ICONPREFIX)/" -e "s/Version: .*/Version: $(PKGVERSION)/" \
+ -e "s/Release: .*/Release: $(PKGREV)/" > $(MISC)/$(TARGET)-menus.spec
+- @echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
+- @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
++ echo "%define _rpmdir $(RPMDIR)" >> $(MISC)/$(TARGET)-menus.spec
++ $(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) --target noarch
+
+ .ENDIF
More information about the fedora-cvs-commits
mailing list