SPECS (AC-branch): openoffice.org.spec - use ooo-build-2.1.8 again

[glen]

Author: glen                         Date: Wed Mar 28 17:21:44 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use ooo-build-2.1.8 again

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.53 -> 1.704.2.54) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.53 SPECS/openoffice.org.spec:1.704.2.54
--- SPECS/openoffice.org.spec:1.704.2.53	Wed Mar 28 19:15:46 2007
+++ SPECS/openoffice.org.spec	Wed Mar 28 19:21:38 2007
@@ -69,7 +69,7 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		_rel		3.2
+%define		_rel		3.3
 %define		upd			680
 %define		mws			OOE%{upd}
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
@@ -84,8 +84,8 @@
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	ooo-build-ooe680-m6.tar.gz
-# Source0-md5:	797f04099223b549ed1b4939dfc2a335
+Source0:	http://go-ooo.org/packages/OOE680/ooo-build-2.1.8.tar.gz
+# Source0-md5:	ec39e9bb30c5285afba50ae32dbe7af2
 Source1:	http://go-ooo.org/packages/%{mws}/%{tag}-core.tar.bz2
 # Source1-md5:	7dbf5f7ea4f469bb6c8b1d6037567431
 Source2:	http://go-ooo.org/packages/%{mws}/%{tag}-system.tar.bz2
@@ -125,9 +125,9 @@
 Patch2:		%{name}-stl5_fix.patch
 Patch3:		%{name}-mdbtools_fix.diff
 Patch4:		%{name}-nolfs_hack.patch
-Patch5:		%{name}-no_fonts_dir_buildfix.patch
 Patch6:		%{name}-java16.patch
 Patch7:		%{name}-nodictinst.patch
+Patch8:		%{name}-73257.patch
 # patches applied by ooo-patching-system
 Patch100:	%{name}-STL-lib64.diff
 Patch101:	%{name}-64bit-inline.diff
@@ -2067,11 +2067,11 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %if %{with system_myspell}
 %patch7 -p1
 %endif
+%patch8 -p1
 
 # 64 bit related patches (not applied now)
 install %{PATCH100} patches/64bit
@@ -3037,6 +3037,9 @@
 
 %{_desktopdir}/template.desktop
 
+%{_iconsdir}/hicolor/*/apps/ooo-gulls.png
+%{_iconsdir}/hicolor/*/apps/ooo-printeradmin.png
+%{_iconsdir}/hicolor/*/apps/ooo-template.png
 %{_pixmapsdir}/ooo-gulls.png
 %{_pixmapsdir}/ooo-template.png
 
@@ -3248,6 +3251,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/libmcnttype.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmdb680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmdbimpl680*.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libmsworks680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libmysql2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbc2.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libodbcbase2.so
@@ -3416,6 +3420,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/sbase
 %{_mandir}/man1/oobase.1
 %{_desktopdir}/base.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-base.png
 %{_pixmapsdir}/ooo-base.png
 %{_libdir}/%{name}/program/resource/cnr680en-US.res
 %if %{with java}
@@ -3445,6 +3450,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/scalc
 %{_mandir}/man1/oocalc.1
 %{_desktopdir}/calc.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-calc.png
 %{_pixmapsdir}/ooo-calc.png
 %if %{with java}
 %{_datadir}/%{name}/help/en/scalc.*
@@ -3470,6 +3476,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/sdraw
 %{_mandir}/man1/oodraw.1
 %{_desktopdir}/draw.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-draw.png
 %{_pixmapsdir}/ooo-draw.png
 %if %{with java}
 %{_datadir}/%{name}/help/en/sdraw.*
@@ -3497,6 +3504,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/swriter
 %{_mandir}/man1/oowriter.1
 %{_desktopdir}/writer.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-writer.png
 %{_pixmapsdir}/ooo-writer.png
 %if %{with java}
 %{_datadir}/%{name}/help/en/swriter.*
@@ -3529,6 +3537,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/simpress
 %{_mandir}/man1/ooimpress.1
 %{_desktopdir}/impress.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-impress.png
 %{_pixmapsdir}/ooo-impress.png
 %if %{with java}
 %{_datadir}/%{name}/help/en/simpress.*
@@ -3552,6 +3561,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/smath
 %{_mandir}/man1/oomath.1
 %{_desktopdir}/math.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-math.png
 %{_pixmapsdir}/ooo-math.png
 %if %{with java}
 %{_datadir}/%{name}/help/en/smath.*
@@ -3573,6 +3583,7 @@
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb
 %{_mandir}/man1/ooweb.1
 %{_desktopdir}/web.desktop
+%{_iconsdir}/hicolor/*/apps/ooo-web.png
 %{_pixmapsdir}/ooo-web.png
 
 %files graphicfilter
@@ -3928,6 +3939,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.54  2007/03/28 17:21:38  glen
+- use ooo-build-2.1.8 again
+
 Revision 1.704.2.53  2007/03/28 17:15:46  glen
 - do not move presets dir, that instead makes initial profile init fail as copy_recursive doesn't copy symlink to dir
 
================================================================

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