Updated to version 1.9.5

3 files changed, 14 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81bf4e54f3ef..de26a05e45b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = htmldoc
 	pkgdesc = HTML Conversion Software
-	pkgver = 1.9.4
-	pkgrel = 3
+	pkgver = 1.9.5
+	pkgrel = 1
 	url = https://www.msweet.org/htmldoc/index.html
 	changelog = ChangeLog
 	arch = i686
@@ -11,11 +11,10 @@ pkgbase = htmldoc
 	depends = gnutls
 	depends = fltk
 	depends = shared-mime-info
-	noextract = htmldoc-1.9.4-source.tar.gz
-	source = https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.4/htmldoc-1.9.4-source.tar.gz
-	source = https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.4/htmldoc-1.9.4-source.tar.gz.sig
+	source = https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.5/htmldoc-1.9.5-source.tar.gz
+	source = https://github.com/michaelrsweet/htmldoc/releases/download/v1.9.5/htmldoc-1.9.5-source.tar.gz.sig
 	validpgpkeys = 845464660B686AAB36540B6F999559A027815955
-	sha256sums = 8e33d22e0d757099bcbc09d513dae599bdb735450f2af24597f325a7a854d1f7
+	sha256sums = 0be1ae7986e01e94d482b3af7dcee19800117c8a61ef67426c30ae7744a79ea6
 	sha256sums = SKIP
 
 pkgname = htmldoc
diff --git a/ChangeLog b/ChangeLog
index ac6495864dc3..ada644d1bfb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-27 Daniel Bermond < gmail-com: danielbermond >
+
+    * 1.9.5-1 :
+    new upstream release
+    remove top-level directory creation for sources (now provided in upstream source file)
+
 2018-11-23 Daniel Bermond < gmail-com: danielbermond >
 
     * 1.9.4-3 :
diff --git a/PKGBUILD b/PKGBUILD
index ba49ec6c8878..281cb37cdd23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
 
 pkgname=htmldoc
-pkgver=1.9.4
-pkgrel=3
+pkgver=1.9.5
+pkgrel=1
 pkgdesc='HTML Conversion Software'
 arch=('i686' 'x86_64')
 url='https://www.msweet.org/htmldoc/index.html'
@@ -16,19 +16,10 @@ license=('GPL2')
 depends=('libxpm' 'gnutls' 'fltk' 'shared-mime-info')
 changelog=ChangeLog
 source=("https://github.com/michaelrsweet/htmldoc/releases/download/v${pkgver}/htmldoc-${pkgver}-source.tar.gz"{,.sig})
-noextract=("htmldoc-${pkgver}-source.tar.gz")
-sha256sums=('8e33d22e0d757099bcbc09d513dae599bdb735450f2af24597f325a7a854d1f7'
+sha256sums=('0be1ae7986e01e94d482b3af7dcee19800117c8a61ef67426c30ae7744a79ea6'
             'SKIP')
 validpgpkeys=('845464660B686AAB36540B6F999559A027815955') # Michael R Sweet
 
-prepare() {
-    mkdir -p "${pkgname}-${pkgver}"
-    cd "${pkgname}-${pkgver}"
-    
-    # source file misses a top-level directory
-    bsdtar -xf "${srcdir}/htmldoc-${pkgver}-source.tar.gz"
-}
-
 build() {
     cd "${pkgname}-${pkgver}"