SPECS: openoffice.org.spec - mono build success

[glen]

Author: glen                         Date: Tue Mar 20 17:10:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- mono build success

---- Files affected:
SPECS:
   openoffice.org.spec (1.745 -> 1.746) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.745 SPECS/openoffice.org.spec:1.746
--- SPECS/openoffice.org.spec:1.745	Tue Mar 20 02:39:29 2007
+++ SPECS/openoffice.org.spec	Tue Mar 20 18:10:28 2007
@@ -12,8 +12,6 @@
 #	- problems with gcc-4.2.0: oowriter is useless (invisble text till refresh)
 #	- fix help files (broken links)
 #	- LFS support is disabled (no_lfs_hack.patch for xml2cmp crash) because it need LFS-ready STLport
-#   - bcond with_mono is broken (cli_types.dll not found, and can't be made)
-#     cli_*.dll are available from http://go-ooo.org/packages/OOE680/
 #	- maybe it could be build with gcc-java
 #   - adapt help-support.diff to PLD
 #	- configure --without-ppds --without afms
@@ -38,7 +36,7 @@
 %bcond_without	gnomevfs	# GNOME VFS and Evolution 2 support
 %bcond_without	java		# without Java support (disables help support)
 %bcond_without	kde		# KDE L&F packages
-%bcond_with	mono		# enable compilation of mono bindings
+%bcond_without	mono		# disable compilation of mono bindings
 %bcond_without	mozilla		# without mozilla components
 %bcond_without	i18n		# do not create i18n packages
 
@@ -69,7 +67,7 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		_rel		0.2
+%define		_rel		0.5
 %define		upd			680
 %define		mws			OOE%{upd}
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
@@ -135,6 +133,7 @@
 Patch108:	%{name}-java6.patch
 Patch109:	%{name}-agg25.patch
 Patch110:	%{name}-nsplugin-path.diff
+Patch111:	%{name}-perl-nodiag.patch
 URL:		http://www.openoffice.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	STLport-devel >= 2:5.0.0
@@ -2081,7 +2080,7 @@
 
 echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109}; do
+for P in %{PATCH102} %{PATCH104} %{PATCH108} %{PATCH109} %{PATCH111}; do
 	PATCHNAME=PLD-${P##*/%{name}-}
 	PATCHNAME=${PATCHNAME%.patch}.diff
 	install $P patches/src680/$PATCHNAME
@@ -2322,7 +2321,7 @@
 	rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup.log
 
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
-	rm $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
+	rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
 
 	%if %{without java}
 	# Java-releated bits
@@ -2334,6 +2333,10 @@
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
 	%endif
 
+	%if %{with mono}
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mono-ooo-2.1.pc
+	%endif
+
 	# Remove dictionaries (in separate pkg)
 	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
 	%if %{with system_myspell}
@@ -2949,6 +2952,16 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/viewdoc
 %{_libdir}/%{name}/program/versionrc
 
+%if %{with mono}
+%{_libdir}/%{name}/program/cli_basetypes.dll
+%{_libdir}/%{name}/program/cli_cppuhelper.dll
+%{_libdir}/%{name}/program/cli_types.dll
+%{_libdir}/%{name}/program/cli_uno_bridge.dll
+%{_libdir}/%{name}/program/cli_ure.dll
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
+%endif
+
 %if %{with java}
 %{_libdir}/%{name}/help
 %dir %{_datadir}/%{name}/help
@@ -3922,6 +3935,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.746  2007/03/20 17:10:28  glen
+- mono build success
+
 Revision 1.745  2007/03/20 01:39:29  glen
 - disable strip (we do it in rpm), typo in with mono bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.745&r2=1.746&f=u