SPECS (AC-branch): openoffice.org.spec - HEAD merge: - Fixed upd...

glen glen at pld-linux.org
Sun Mar 11 17:22:13 CET 2007 

Author: glen                         Date: Sun Mar 11 16:22:13 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge:
  - Fixed updating desktop & mime database.
  - Updated a comment about disk space requirements.
  - rel 6

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.28 -> 1.704.2.29) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.28 SPECS/openoffice.org.spec:1.704.2.29
--- SPECS/openoffice.org.spec:1.704.2.28	Sun Mar 11 17:00:06 2007
+++ SPECS/openoffice.org.spec	Sun Mar 11 17:22:08 2007
@@ -1,28 +1,26 @@
 # $Revision$, $Date$
 # NOTE:
-#	- normal build with java requires about 24GB of disk space
-#		$BUILD_ROOT	 7.1 GB
-#		BUILD		15.7 GB
-#		SRPMS		 0.3 GB
-#		RPMS		 1.2 GB
+#	- normal build (athlon) requires about 15 GB of disk space:
+#		$BUILD_ROOT	3.7 GB
+#		BUILD		9.6 GB
+#		SRPMS		0.3 GB
+#		RPMS		0.9 GB
 # TODO:
 #	- without system_db will not work (w/ java) as it will use db4.2 which is too old (see r1.650)
 #	- 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)
-#	- build on 64-bit architectures
-#	- doesn't build with java-sun-1.6 (maybe java-dependent packages are screwed)
+#   - bcond with_mono is broken (cli_types.dll not found, and can't be made)
 #	- maybe it could be build with gcc-java
-#       - adapt help-support.diff to PLD
+#   - adapt help-support.diff to PLD
 #	- configure --without-ppds --without afms
 #	- /share/config/soffice.cfg/global/accelerator/es/ should be in i18n-es
 #	- fix locale names and other locale related things
-#       - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
+#   - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
 #   - more system libs todo:
 #	- (SYSTEM_HYPH) bcond system_libhnj doesn't work - needs Debian-patched version of libhnj
 #	- --with-system-mythes + mythes package (http://lingucomponent.openoffice.org/thesaurus.html)
-#   - --with-system-mspack    use libmspack already installed on system
+#   - --with-system-mspack - use libmspack already installed on system
 #	- bcond system_xt doesn't work - xt in PLD is too old or broken
 #
 #	$ grep SYSTEM ooo-build-ooe680-m6/build/ooe680-m6/config_office/config.log |grep NO
@@ -64,7 +62,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		5.2
+%define		_rel		6
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -292,6 +290,8 @@
 Summary:	Core modules for OpenOffice.org
 Summary(pl):	Podstawowe moduły dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	shared-mime-info
 %{?with_system_beanshell:Requires:	beanshell}
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
@@ -299,7 +299,6 @@
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
 Requires:	sed
-Requires:	shared-mime-info
 %{?with_system_xalan:Requires:	xalan-j}
 %{?with_system_xerces:Requires:	xerces-j}
 %{?with_system_xml_apis:Requires:	xml-commons}
@@ -338,6 +337,7 @@
 Summary:	Database frontend for OpenOffice.org
 Summary(pl):	Frontend do baz danych dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description base
@@ -353,6 +353,7 @@
 Summary:	Web module for OpenOffice.org
 Summary(pl):	Moduł Web dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 Requires:	%{name}-writer = %{epoch}:%{version}-%{release}
 
@@ -366,6 +367,7 @@
 Summary:	Writer module for OpenOffice.org
 Summary(pl):	Moduł Writer dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description writer
@@ -392,6 +394,7 @@
 Summary:	Calc module for OpenOffice.org
 Summary(pl):	Moduł Calc dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description calc
@@ -404,6 +407,7 @@
 Summary:	Draw module for OpenOffice.org
 Summary(pl):	Moduł Draw dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description draw
@@ -416,6 +420,7 @@
 Summary:	Impress module for OpenOffice.org
 Summary(pl):	Moduł Impress dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description impress
@@ -428,6 +433,7 @@
 Summary:	Math module for OpenOffice.org
 Summary(pl):	Moduł Math dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description math
@@ -2427,14 +2433,54 @@
 fi
 
 %post core
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_mime_database
+%update_desktop_database_post
 
 %postun core
-umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
-[ ! -x /usr/bin/update-mime-database ] || /usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
+%update_desktop_database_postun
+%update_mime_database
+
+%post base
+%update_desktop_database_post
+
+%postun base
+%update_desktop_database_postun
+
+%post web
+%update_desktop_database_post
+
+%postun web
+%update_desktop_database_postun
+
+%post writer
+%update_desktop_database_post
+
+%postun writer
+%update_desktop_database_postun
+
+%post calc
+%update_desktop_database_post
+
+%postun calc
+%update_desktop_database_postun
+
+%post draw
+%update_desktop_database_post
+
+%postun draw
+%update_desktop_database_postun
+
+%post impress
+%update_desktop_database_post
+
+%postun impress
+%update_desktop_database_postun
+
+%post math
+%update_desktop_database_post
+
+%postun math
+%update_desktop_database_postun
 
 %post -n fonts-TTF-OpenSymbol
 fontpostinst TTF
@@ -3812,6 +3858,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.29  2007/03/11 16:22:08  glen
+- HEAD merge:
+  - Fixed updating desktop & mime database.
+  - Updated a comment about disk space requirements.
+  - rel 6
+
 Revision 1.704.2.28  2007/03/11 16:00:06  glen
 - link dicts dir before share dir
 
================================================================

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

More information about the pld-cvs-commit mailing list