rpms/openoffice.org/devel openoffice.org.spec,1.674,1.675

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
damn patch backup in rpms


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -r1.674 -r1.675
--- openoffice.org.spec	25 Apr 2006 15:43:00 -0000	1.674
+++ openoffice.org.spec	26 Apr 2006 17:47:06 -0000	1.675
@@ -259,6 +259,7 @@
 %if ! %{build_rhel4}
 Requires: bitstream-vera-fonts
 %endif
+Requires: urw-fonts
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
 # rpm doesn't "do the right thing" if only the packages are Required.
@@ -901,7 +902,6 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: urw-fonts
 %if %{obsoleteold}
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
@@ -1151,7 +1151,7 @@
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
-%patch40 -p1 -b .rh188467.printingdefaults.patch
+%patch40 -p1 .rh188467.printingdefaults.patch
 %patch41 -p1 -b .ooo64463.extensions.noxaw.patch
 %patch42 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch43 -p1 -b .ooo64743.vcl.adjustonlevel1.patch