Requires: java >= 1.6.0; set LibreOffice 3.5 packages as Obsoletes

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6706 ec354946-7b23-47d6-9f5a-488ba84defc7

i/install-assist-LibreOffice/install-assist-LibreOffice-vl.spec

@@ -21,7 +21,7 @@ Summary:	Package to assist installation of %{pkgname}
 Summary(ja): 	%{pkgname} のインストールを補助するパッケージ
 Name:		install-assist-%{pkgname}
 Version:	%{version}
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 License:	LGPLv3
 Group:		Applications/Productivity
 
@@ -35,7 +35,7 @@ Requires:	libgnome >= 2.16
 Requires:	at-spi >= 1.7
 
 # Needs JAVA VM <BTS:1168>
-Requires:	java-1.6.0
+Requires:	java >= 1.6.0
 
 # We have to specify previous version with "Conflicts:" 
 # to make smart upgrading. See [VineSeed:20565]. 
@@ -175,12 +175,72 @@ Obsoletes:	libreoffice3.4-ja
 Obsoletes:	libreoffice3.4-math
 Obsoletes:	libreoffice3.4-ure
 Obsoletes:	libreoffice3.4-writer
+# Obsoletes:	libobasis3.5-core01
+# Obsoletes:	libreoffice3.5-ure libreoffice3.5-stdlibs
+# Obsoletes:	libreoffice3.5-freedesktop-menus
+Obsoletes:	libobasis3.5-base
+Obsoletes:	libobasis3.5-binfilter
+Obsoletes:	libobasis3.5-calc
 Obsoletes:	libobasis3.5-core01
-Obsoletes:	libreoffice3.5-ure libreoffice3.5-stdlibs
+Obsoletes:	libobasis3.5-core02
+Obsoletes:	libobasis3.5-core03
+Obsoletes:	libobasis3.5-core04
+Obsoletes:	libobasis3.5-core05
+Obsoletes:	libobasis3.5-core06
+Obsoletes:	libobasis3.5-core07
+Obsoletes:	libobasis3.5-draw
+Obsoletes:	libobasis3.5-en-US
+Obsoletes:	libobasis3.5-en-US-base
+Obsoletes:	libobasis3.5-en-US-calc
+Obsoletes:	libobasis3.5-en-US-math
+Obsoletes:	libobasis3.5-en-US-res
+Obsoletes:	libobasis3.5-en-US-writer
+Obsoletes:	libobasis3.5-extension-beanshell-script-provider
+Obsoletes:	libobasis3.5-extension-javascript-script-provider
+Obsoletes:	libobasis3.5-extension-mediawiki-publisher
+Obsoletes:	libobasis3.5-extension-nlpsolver
+Obsoletes:	libobasis3.5-extension-pdf-import
+Obsoletes:	libobasis3.5-extension-presentation-minimizer
+Obsoletes:	libobasis3.5-extension-presenter-screen
+Obsoletes:	libobasis3.5-extension-python-script-provider
+Obsoletes:	libobasis3.5-extension-report-builder
+Obsoletes:	libobasis3.5-gnome-integration
+Obsoletes:	libobasis3.5-graphicfilter
+Obsoletes:	libobasis3.5-images
+Obsoletes:	libobasis3.5-impress
+Obsoletes:	libobasis3.5-ja
+Obsoletes:	libobasis3.5-ja-base
+Obsoletes:	libobasis3.5-ja-calc
+Obsoletes:	libobasis3.5-ja-help
+Obsoletes:	libobasis3.5-ja-math
+Obsoletes:	libobasis3.5-ja-res
+Obsoletes:	libobasis3.5-ja-writer
+Obsoletes:	libobasis3.5-javafilter
+Obsoletes:	libobasis3.5-kde-integration
+Obsoletes:	libobasis3.5-math
+Obsoletes:	libobasis3.5-ogltrans
+Obsoletes:	libobasis3.5-onlineupdate
+Obsoletes:	libobasis3.5-ooofonts
+Obsoletes:	libobasis3.5-ooolinguistic
+Obsoletes:	libobasis3.5-postgresql-sdbc
+Obsoletes:	libobasis3.5-pyuno
+Obsoletes:	libobasis3.5-writer
+Obsoletes:	libobasis3.5-xsltfilter
+Obsoletes:	libreoffice3.5
+Obsoletes:	libreoffice3.5-base
+Obsoletes:	libreoffice3.5-calc
+Obsoletes:	libreoffice3.5-dict-en
+Obsoletes:	libreoffice3.5-dict-es
+Obsoletes:	libreoffice3.5-dict-fr
+Obsoletes:	libreoffice3.5-draw
+Obsoletes:	libreoffice3.5-en-US
 Obsoletes:	libreoffice3.5-freedesktop-menus
-# Obsoletes:	libobasis3.6-core01
-# Obsoletes:	libreoffice3.6-ure libreoffice3.6-stdlibs
-# Obsoletes:	libreoffice3.6-freedesktop-menus
+Obsoletes:	libreoffice3.5-impress
+Obsoletes:	libreoffice3.5-ja
+Obsoletes:	libreoffice3.5-math
+Obsoletes:	libreoffice3.5-stdlibs
+Obsoletes:	libreoffice3.5-ure
+Obsoletes:	libreoffice3.5-writer
 
 Packager:	kazutaka, munepi
 
@@ -244,6 +304,10 @@ QUEDIR=/var/cache/self-build
 %files
 
 %changelog
+* Sat Aug 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 3.6.0-2
+- Requires: java >= 1.6.0
+- set LibreOffice 3.5 packages as Obsoletes
+
 * Fri Aug 10 2012 Munehiro Yamamoto <munepi@vinelinux.org> 3.6.0-1
 - new upstream release