[arch-commits] Commit in josm/trunk (PKGBUILD josm.changelog)

[Balló György]

    Date: Wednesday, June 19, 2019 @ 15:30:46
  Author: bgyorgy
Revision: 482400

upgpkg: josm 15155-2

josm 15155-2 - FS#62694 fix

Modified:
  josm/trunk/PKGBUILD
  josm/trunk/josm.changelog

----------------+
 PKGBUILD       |   35 +++++++++++++++++++++--------------
 josm.changelog |    6 ++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-19 15:26:44 UTC (rev 482399)
+++ PKGBUILD	2019-06-19 15:30:46 UTC (rev 482400)
@@ -3,36 +3,43 @@
 
 pkgname=josm
 pkgver=15155
-pkgrel=1
+pkgrel=2
 pkgdesc="An editor for OpenStreetMap written in Java"
 arch=('any')
 url="https://josm.openstreetmap.de/"
 license=('GPL')
-depends=('java-runtime>=8' 'libxtst' 'ttf-font')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'java-runtime>=8' 'libxtst' 'ttf-font')
+makedepends=('subversion')
 changelog=$pkgname.changelog
 backup=('etc/conf.d/josm')
-source=(https://josm.openstreetmap.de/$pkgname-tested.jar
-        $pkgname-$pkgver.desktop::https://josm.openstreetmap.de/export/${pkgver}/josm/trunk/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
+source=(https://josm.openstreetmap.de/download/$pkgname-snapshot-$pkgver.jar
+        $pkgname::svn+https://josm.openstreetmap.de/svn/trunk#revision=$pkgver
         $pkgname.conf.d)
-noextract=($pkgname-tested.jar)
+noextract=($pkgname-snapshot-$pkgver.jar)
 sha256sums=('3596988ced04d42bed1a2ac6340299a865136263c7e6a6ad8fa1d6b3df2a9a63'
-            'dab386f139d773e34e14c2755525a9a60ef4db549f2562388273bd2f1257e2fc'
+            'SKIP'
             'c86a73251eed42fcb129ae9b88a0ee3cf03d8d00a9385519ad536d5af0907663')
 
-prepare() {
-  cd "${srcdir}"
-  bsdtar -xf $pkgname-tested.jar images/logo.svg
-}
-
 package() {
   cd "${srcdir}"
 
-  install -Dm644 $pkgname-tested.jar "${pkgdir}"/usr/share/java/$pkgname/$pkgname.jar
+  install -Dm644 $pkgname-snapshot-$pkgver.jar "${pkgdir}"/usr/share/java/$pkgname/$pkgname.jar
 
 #.desktop and icon file
-  install -Dm644 "${srcdir}"/$pkgname-$pkgver.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop
-  install -Dm644 images/logo.svg "${pkgdir}"/usr/share/pixmaps/$pkgname.svg
+  install -Dm644 $pkgname/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop \
+        "${pkgdir}"/usr/share/applications/org.openstreetmap.josm.desktop
+  install -Dm644 $pkgname/linux/tested/usr/share/man/man1/josm.1 \
+        "${pkgdir}"/usr/share/man/man1/josm.1
+  install -Dm644 $pkgname/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml \
+        "${pkgdir}"/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
+  install -Dm644 $pkgname/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+        "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
 
+  for _icon in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+      install -Dm644 $pkgname/linux/tested/usr/share/icons/hicolor/${_icon}x${_icon}/apps/org.openstreetmap.josm.png \
+        "${pkgdir}"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/org.openstreetmap.josm.png
+  done
+
 #executable file
   install -d "${pkgdir}"/usr/bin
   cat <<"EOF" >"${pkgdir}"/usr/bin/$pkgname 

Modified: josm.changelog
===================================================================
--- josm.changelog	2019-06-19 15:26:44 UTC (rev 482399)
+++ josm.changelog	2019-06-19 15:30:46 UTC (rev 482400)
@@ -1,3 +1,9 @@
+2019-06-06 Balló György <ballogyor+arch at gmail dot com>
+	* josm 15155-2
+	* FS#62694 fix
+	* Use unique name for the snapshot jar
+	* Get man page, metainfo and icons from upstream source
+
 2019-06-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* josm 15155-1