rpms/openoffice.org/devel workspace.cmcfixes49.patch,1.2,1.3

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	workspace.cmcfixes49.patch 
Log Message:
tum te tum

workspace.cmcfixes49.patch:

Index: workspace.cmcfixes49.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes49.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes49.patch	23 Aug 2008 21:35:28 -0000	1.2
+++ workspace.cmcfixes49.patch	24 Aug 2008 10:34:11 -0000	1.3
@@ -55,38 +55,6 @@
  ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
  ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
  ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
---- xpdf/makefile.mk	11 Jul 2008 07:11:25 -0000	1.7
-+++ xpdf/makefile.mk	19 Aug 2008 15:13:11 -0000
-@@ -42,6 +42,12 @@
- 
- .INCLUDE: settings.mk
- 
-+.IF "$(SYSTEM_POPPLER)" == "YES"
-+dummy:
-+        @echo "An already available installation of poppler should exist on your system."
-+        @echo "Therefore xpdf provided here does not need to be built in addition."
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
- 
- TARFILE_NAME=xpdf-3.02
---- xpdf/prj/build.lst	6 Jun 2008 16:48:36 -0000	1.3
-+++ xpdf/prj/build.lst	19 Aug 2008 15:13:11 -0000
-@@ -1,4 +1,2 @@
- xp      xpdf : solenv sal soltools NULL
- xp      xpdf						nmake   -       all     xp_xpdf NULL
--xp		xpdf\wrapper			    nmake	-		all		xp_xpdfwrap xp_xpdf NULL
--xp		xpdf\test				    nmake	-		all		xp_parsetest xp_xpdfwrap NULL
---- xpdf/prj/d.lst	5 Dec 2007 14:16:41 -0000	1.1
-+++ xpdf/prj/d.lst	19 Aug 2008 15:13:11 -0000
-@@ -1,3 +1,5 @@
- mkdir: %_DEST%\inc%_EXT%\xpdf
--..\%__SRC%\bin\xpdfimport.* %_DEST%\bin%_EXT%\xpdfimport.*
--..\%__SRC%\bin\xpdfimport   %_DEST%\bin%_EXT%\xpdfimport
-+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\xpdf\*.h
-+..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%
-+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
-+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 --- sdext/prj/build.lst	24 Apr 2008 18:30:30 -0000	1.31
 +++ sdext/prj/build.lst	19 Aug 2008 15:13:19 -0000
 @@ -7,10 +7,12 @@