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

Caolan McNamara caolanm at fedoraproject.org
Wed Jul 22 11:16:12 UTC 2009


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
temp hack


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -p -r1.1970 -r1.1971
--- openoffice.org.spec	21 Jul 2009 11:41:28 -0000	1.1970
+++ openoffice.org.spec	22 Jul 2009 11:15:42 -0000	1.1971
@@ -1743,6 +1743,13 @@ 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
@@ -4168,7 +4175,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Jul 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-16.1
+* Wed Jul 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-16.1
 - next milestone
 - drop integrated openoffice.org-3.1.1-ooo102679.sdext.buildfix.patch
 - drop integrated workspace.aw073.patch




More information about the fedora-extras-commits mailing list