upgpkg: p7zip-gui 16.02-9

* remove KDE4 contex menus and add them to KDE6
* minor packaging imrpovements

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70f24b941743..224ba461eced 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = p7zip-gui
 	pkgdesc = Graphic user interface (alpha quality) for the 7zip file archiver
 	pkgver = 16.02
-	pkgrel = 8
+	pkgrel = 9
 	url = http://p7zip.sourceforge.net
 	install = p7zip-gui.install
 	arch = i686
 	arch = x86_64
 	license = custom:unRAR
-	license = LGPL
+	license = LGPL-2.1-or-later
 	makedepends = python
 	depends = p7zip
 	depends = wxwidgets-gtk3
diff --git a/PKGBUILD b/PKGBUILD
index 5080a8b264e9..5d2061a091cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,10 @@
 
 pkgname=p7zip-gui
 pkgver=16.02
-pkgrel=8
+pkgrel=9
 pkgdesc='Graphic user interface (alpha quality) for the 7zip file archiver'
 url='http://p7zip.sourceforge.net'
-license=('custom:unRAR' 'LGPL')
+license=('custom:unRAR' ' LGPL-2.1-or-later')
 arch=('i686' 'x86_64')
 depends=('p7zip' 'wxwidgets-gtk3')
 optdepends=('desktop-file-utils: desktop entries'
@@ -74,19 +74,18 @@ package() {
 		DEST_MAN="/usr/share/man"
 
 	# remove files provided by p7zip package
-	rm -fR ${pkgdir}/usr/lib/p7zip/{7z.so,Codecs}
-	rm -R ${pkgdir}/usr/share/{doc,man}
+	rm -f -R \
+		${pkgdir}/usr/lib/p7zip/Codecs \
+		${pkgdir}/usr/lib/p7zip/7z.so \
+		${pkgdir}/usr/share/man
+	find ${pkgdir}/usr/share/doc -type f -not -path "${pkgdir}/usr/share/doc/p7zip/DOC/MANUAL/fm*" -delete
+	find ${pkgdir}/usr/share/doc -type d -empty -delete
 
-	install -Dm644 GUI/p7zip_32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/p7zip.png
-	install -dm755 ${pkgdir}/usr/share/{applications,kde4/services/ServiceMenus}
-	cp GUI/kde4/*.desktop ${pkgdir}/usr/share/kde4/services/ServiceMenus
-	install -dm755 ${pkgdir}/usr/share/kservices5/ServiceMenus
-	cp GUI/kde4/*.desktop ${pkgdir}/usr/share/kservices5/ServiceMenus
-	cp ../7zFM.desktop ${pkgdir}/usr/share/applications
+	install -D -m 644 GUI/p7zip_32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/p7zip.png
+	install -D -m 644 -t ${pkgdir}/usr/share/kservices5/ServiceMenus GUI/kde4/*.desktop
+	install -D -m 644 -t ${pkgdir}/usr/share/kio/servicemenus GUI/kde4/*.desktop
+	install -D -m 644 -t ${pkgdir}/usr/share/applications ${srcdir}/7zFM.desktop
 	ln -s 7zCon.sfx ${pkgdir}/usr/lib/p7zip/7z.sfx
-	install -dm755 ${pkgdir}/usr/share/doc/p7zip/DOC/MANUAL
-	cp -r DOC/MANUAL/fm ${pkgdir}/usr/share/doc/p7zip/DOC/MANUAL
-	chmod -R a+r,u+w,a+X ${pkgdir}/usr/share/doc/p7zip/DOC/MANUAL/fm
 	ln -s /usr/share/doc/p7zip/DOC/MANUAL ${pkgdir}/usr/lib/p7zip/help
 	chmod +x ${pkgdir}/usr/bin/p7zipForFilemanager
 }
diff --git a/p7zip-gui.install b/p7zip-gui.install
index d7b75a3745b6..864734efe6b1 100644
--- a/p7zip-gui.install
+++ b/p7zip-gui.install
@@ -4,13 +4,16 @@ post_install() {
 	printf ">>> Use it only for viewing archives. Every manipulation of archives\n"
 	printf ">>> using this tool can produce unpredictable results.\n"
 	[[ -x usr/bin/kbuildsycoca5 ]] && kbuildsycoca5 &> /dev/null || true
+	[[ -x usr/bin/kbuildsycoca6 ]] && kbuildsycoca6 &> /dev/null || true
 }
 
 post_upgrade() {
-	post_install
+	[[ -x usr/bin/kbuildsycoca5 ]] && kbuildsycoca5 &> /dev/null || true
+	[[ -x usr/bin/kbuildsycoca6 ]] && kbuildsycoca6 &> /dev/null || true
 }
 
 
 post_remove() {
 	[[ -x usr/bin/kbuildsycoca5 ]] && kbuildsycoca5 &> /dev/null || true
+	[[ -x usr/bin/kbuildsycoca6 ]] && kbuildsycoca6 &> /dev/null || true
 }