install-assist-LibreOffice: update to 6.0.5

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

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

@@ -1,44 +1,45 @@
 %define pkgname LibreOffice
-%define major_version 5.4
+%define major_version 6.0
-%define version	%{major_version}.7
+%define version %{major_version}.5
+
 %ifarch %{ix86}
-%define	uarch	x86
+%define uarch x86
-%define	pkgarch	x86
+%define pkgarch x86
-%define	rpmarch	i586
+%define rpmarch i586
 %endif
 %ifarch x86_64
-%define	uarch	x86_64
+%define uarch x86_64
-%define	pkgarch	x86-64
+%define pkgarch x86-64
-%define	rpmarch x86_64
+%define rpmarch x86_64
 %endif
 
 #% define baseurl \{http://download.documentfoundation.org,http://mirrors.vinelinux.org\}/libreoffice/stable/%{version}/rpm/%{uarch}
 %define baseurl http://mirrors.vinelinux.org/libreoffice/stable/%{version}/rpm/%{uarch}
 %define dlurl \\\
-	%{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm.tar.gz \\\
+ %{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm.tar.gz \\\
-	%{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm_langpack_ja.tar.gz \\\
+ %{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm_langpack_ja.tar.gz \\\
-	%{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm_helppack_ja.tar.gz
+ %{baseurl}/LibreOffice_%{version}_Linux_%{pkgarch}_rpm_helppack_ja.tar.gz
 
 Summary:	Package to assist installation of %{pkgname}
-Summary(ja): 	%{pkgname} のインストールを補助するパッケージ
+Summary(ja): %{pkgname} のインストールを補助するパッケージ
-Name:		install-assist-%{pkgname}
+Name:    install-assist-%{pkgname}
-Version:	%{version}
+Version: %{version}
-Release: 	1%{?_dist_release}
+Release: 1%{?_dist_release}
-License:	LGPLv3
+License: LGPLv3
-Group:		Applications/Productivity
+Group:   Applications/Productivity
-
+
-ExclusiveArch:	%{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64
 # Requires(posttrans) not yet implemented. So we use (post) instead.
-Requires(post):	self-build-setup >= 1.0
+Requires(post): self-build-setup >= 1.0
-Requires:	glibc >= 2.5
+Requires: glibc >= 2.5
-Requires:	gtk2 >= 2.10.4
+Requires: gtk2 >= 2.10.4
-Requires:	libgnome >= 2.16
+Requires: libgnome >= 2.16
-#Requires:	libgail-gnome >= 1.8.6
+#Requires: libgail-gnome >= 1.8.6
-Requires:	at-spi >= 1.7
+Requires: at-spi >= 1.7
-Requires:	mesa-libGLU
+Requires: mesa-libGLU
 
 # 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]. 
@@ -266,7 +267,63 @@ Obsoletes: libreoffice5.3-math
 Obsoletes: libreoffice5.3-ure
 Obsoletes: libreoffice5.3-writer
 
-Packager:	kazutaka, munepi, ara_t
+# rpm -qa --qf "Obsoletes: %{name}\n" | grep -e "libreoffice" -e "libobasis" | sort
+Obsoletes: libobasis5.4-base
+Obsoletes: libobasis5.4-calc
+Obsoletes: libobasis5.4-core
+Obsoletes: libobasis5.4-draw
+Obsoletes: libobasis5.4-en-US
+Obsoletes: libobasis5.4-en-US-base
+Obsoletes: libobasis5.4-en-US-calc
+Obsoletes: libobasis5.4-en-US-math
+Obsoletes: libobasis5.4-en-US-res
+Obsoletes: libobasis5.4-en-US-writer
+Obsoletes: libobasis5.4-extension-beanshell-script-provider
+Obsoletes: libobasis5.4-extension-javascript-script-provider
+Obsoletes: libobasis5.4-extension-mediawiki-publisher
+Obsoletes: libobasis5.4-extension-nlpsolver
+Obsoletes: libobasis5.4-extension-pdf-import
+Obsoletes: libobasis5.4-extension-report-builder
+Obsoletes: libobasis5.4-firebird
+Obsoletes: libobasis5.4-gnome-integration
+Obsoletes: libobasis5.4-graphicfilter
+Obsoletes: libobasis5.4-images
+Obsoletes: libobasis5.4-impress
+Obsoletes: libobasis5.4-ja
+Obsoletes: libobasis5.4-ja-base
+Obsoletes: libobasis5.4-ja-calc
+Obsoletes: libobasis5.4-ja-help
+Obsoletes: libobasis5.4-ja-math
+Obsoletes: libobasis5.4-ja-res
+Obsoletes: libobasis5.4-ja-writer
+Obsoletes: libobasis5.4-kde-integration
+Obsoletes: libobasis5.4-librelogo
+Obsoletes: libobasis5.4-math
+Obsoletes: libobasis5.4-ogltrans
+Obsoletes: libobasis5.4-onlineupdate
+Obsoletes: libobasis5.4-ooofonts
+Obsoletes: libobasis5.4-ooolinguistic
+Obsoletes: libobasis5.4-postgresql-sdbc
+Obsoletes: libobasis5.4-python-script-provider
+Obsoletes: libobasis5.4-pyuno
+Obsoletes: libobasis5.4-writer
+Obsoletes: libobasis5.4-xsltfilter
+Obsoletes: libreoffice5.4
+Obsoletes: libreoffice5.4-base
+Obsoletes: libreoffice5.4-calc
+Obsoletes: libreoffice5.4-dict-en
+Obsoletes: libreoffice5.4-dict-es
+Obsoletes: libreoffice5.4-dict-fr
+Obsoletes: libreoffice5.4-draw
+Obsoletes: libreoffice5.4-en-US
+Obsoletes: libreoffice5.4-freedesktop-menus
+Obsoletes: libreoffice5.4-impress
+Obsoletes: libreoffice5.4-ja
+Obsoletes: libreoffice5.4-math
+Obsoletes: libreoffice5.4-ure
+Obsoletes: libreoffice5.4-writer
+
+Packager: kazutaka, munepi, ara_t
 
 
 %description
@@ -294,10 +351,11 @@ Writer、Calc、Impress、Draw、Math、Base です。
 した場合は、ダウンロードした rpm ファイルのインストールも自
 動的に行います。
 
+
 %install
-%__mkdir_p %{buildroot}%{_bindir}
+%{__mkdir_p} %{buildroot}%{_bindir}
 (cd %{buildroot}%{_bindir}
-  %__ln_s -f libreoffice%{major_version} libreoffice
+  %{__ln_s} -f libreoffice%{major_version} libreoffice
 )
 
 %posttrans
@@ -306,31 +364,31 @@ Writer、Calc、Impress、Draw、Math、Base です。
 . /etc/self-build.conf
 tmp=$(mktemp -d ${TEMP_DIR}/%{name}.XXXXXX)
 QUEDIR=/var/cache/self-build
-[ ! -d ${QUEDIR} ] && %__mkdir_p ${QUEDIR}
+[ ! -d ${QUEDIR} ] && %{__mkdir_p} ${QUEDIR}
 
 (cd ${tmp}
     ## If the cached tarballs exist, copy them into ${tmp}
     if [ "${CACHE_DOWNLOADED_FILES}" = "yes" ]; then
-       for i in %{dlurl}; do 
+        for i in %{dlurl}; do
-       	   [ -f ${QUEDIR}/$(basename $i) ] && %__cp -af ${QUEDIR}/$(basename $i) ${tmp}; done
+            [ -f ${QUEDIR}/$(basename $i) ] && %{__cp} -af ${QUEDIR}/$(basename $i) ${tmp}; done
     fi
     ## download the official built tarballs
     wget -N %{dlurl}
 
     ## extract them
-    for i in %{dlurl}; do %__tar xf $(basename $i); done
+    for i in %{dlurl}; do %{__tar} xf $(basename $i); done
 
     ## copy including rpms
-    %__cp -af $(find -name "*.%{rpmarch}.rpm") ${QUEDIR}
+    %{__cp} -af $(find -name "*.%{rpmarch}.rpm") ${QUEDIR}
-    %__cp -af $(find -name "*freedesktop-menus*.rpm") ${QUEDIR}
+    %{__cp} -af $(find -name "*freedesktop-menus*.rpm") ${QUEDIR}
 
     if [ "${CACHE_DOWNLOADED_FILES}" = "yes" ]; then
-       for i in %{dlurl}; do 
+        for i in %{dlurl}; do
-       	   [ -f ${QUEDIR}/$(basename $i) ] || %__cp -af $(basename $i) ${QUEDIR}; 
+            [ -f ${QUEDIR}/$(basename $i) ] || %{__cp} -af $(basename $i) ${QUEDIR};
        done
     fi
 )
-%__rm -rf ${tmp}
+%{__rm} -rf ${tmp}
 
 %files
 %defattr(-,root,root)
@@ -338,6 +396,9 @@ QUEDIR=/var/cache/self-build
 
 
 %changelog
+* Mon Jul 16 2018 Toshiaki Ara <ara_t@384.jp> 6.0.5-1
+- update to 6.0.5
+
 * Fri May 18 2018 Toshiaki Ara <ara_t@384.jp> 5.4.7-1
 - update to 5.4.7