rpms/openoffice.org/devel openoffice.org.spec,1.1971,1.1972

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
found them in libXext-devel


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -p -r1.1971 -r1.1972
--- openoffice.org.spec	22 Jul 2009 11:15:42 -0000	1.1971
+++ openoffice.org.spec	22 Jul 2009 12:12:16 -0000	1.1972
@@ -54,13 +54,13 @@ Source9:        openoffice.org-javafilte
 Source10:       http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-IN_DEV300_m40.sdf
 Source11:       http://www.openoffice.org/nonav/issues/showattachment.cgi/62822/acor_en-GB.dat
 Source12:       http://www.openoffice.org/nonav/issues/showattachment.cgi/62823/acor_en-ZA.dat
-BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gcc-c++
+BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:	binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
 BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
-BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel, gperf
+BuildRequires:	libXext-devel, libXt-devel, libICE-devel, libjpeg-devel,
 BuildRequires:	gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
-BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip
+BuildRequires:	db4-devel, sane-backends-devel, libicu-devel, perl-Archive-Zip
 BuildRequires:	freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
 BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
 BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
@@ -1743,13 +1743,6 @@ pushd solver/%{OFFICEUPD}/unxlng*/bin
 ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar 
 popd
 
-#temp hack for now
-mkdir -p solver/%{OFFICEUPD}/unxlng*/inc/X11/extensions
-echo "#include <X11/extensions/shapeconst.h>" > solver/%{OFFICEUPD}/unxlng*/inc/X11/extensions/shape.h
-echo "#include <X11/extensions/shapeproto.h>" >> solver/%{OFFICEUPD}/unxlng*/inc/X11/extensions/shape.h
-echo "#include <X11/extensions/dpmsconst.h>" > solver/%{OFFICEUPD}/unxlng*/inc/X11/extensions/dpms.h
-echo "#include <X11/extensions/dpmsproto.h>" >> solver/%{OFFICEUPD}/unxlng*/inc/X11/extensions/dpms.h
-
 #build OOo, on failure make a stab at debugging the crash if any, and
 #rebuild un-parallel
 cd instsetoo_native/util