SPECS: openoffice.org.spec - Fixed updating desktop & mime databas...

[qrczak]

Author: qrczak                       Date: Sun Mar 11 12:24:39 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Fixed updating desktop & mime database.
- Updated a comment about disk space requirements.
- rel 6

---- Files affected:
SPECS:
   openoffice.org.spec (1.724 -> 1.725) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.724 SPECS/openoffice.org.spec:1.725
--- SPECS/openoffice.org.spec:1.724	Fri Mar  9 21:15:26 2007
+++ SPECS/openoffice.org.spec	Sun Mar 11 13:24:34 2007
@@ -1,10 +1,10 @@
 # $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:
 #   - symlink these files:
 #    WARNING: Using shared_en-US.zip instead of shared_br.zip
@@ -68,7 +68,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		5
+%define		_rel		6
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -292,6 +292,8 @@
 Summary:	Core modules for OpenOffice.org
 Summary(pl.UTF-8):	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 +301,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 +339,7 @@
 Summary:	Database frontend for OpenOffice.org
 Summary(pl.UTF-8):	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 +355,7 @@
 Summary:	Web module for OpenOffice.org
 Summary(pl.UTF-8):	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 +369,7 @@
 Summary:	Writer module for OpenOffice.org
 Summary(pl.UTF-8):	Moduł Writer dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description writer
@@ -392,6 +396,7 @@
 Summary:	Calc module for OpenOffice.org
 Summary(pl.UTF-8):	Moduł Calc dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description calc
@@ -404,6 +409,7 @@
 Summary:	Draw module for OpenOffice.org
 Summary(pl.UTF-8):	Moduł Draw dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description draw
@@ -416,6 +422,7 @@
 Summary:	Impress module for OpenOffice.org
 Summary(pl.UTF-8):	Moduł Impress dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description impress
@@ -428,6 +435,7 @@
 Summary:	Math module for OpenOffice.org
 Summary(pl.UTF-8):	Moduł Math dla OpenOffice.org
 Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
 
 %description math
@@ -2420,14 +2428,54 @@
 %endif
 
 %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
@@ -3803,6 +3851,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.725  2007/03/11 12:24:34  qrczak
+- Fixed updating desktop & mime database.
+- Updated a comment about disk space requirements.
+- rel 6
+
 Revision 1.724  2007/03/09 20:15:26  qrczak
 - Added explicit --with-xalan-jar
 
================================================================

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