aspel: Update to released 0.60.7

msys2 · Jul 30, 2019 · 387e1a5 · 387e1a5
1 parent eb08faf
commit 387e1a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/mingw-w64-aspell/0008-rearrange-includes-for-stat.patch b/mingw-w64-aspell/0008-rearrange-includes-for-stat.patch
diff --git a/mingw-w64-aspell/PKGBUILD b/mingw-w64-aspell/PKGBUILD
@@ -3,9 +3,7 @@
 _realname=aspell
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_date_ver=rc2
-_ver_base=0.60.7
-pkgver=${_ver_base}.${_date_ver}
+pkgver=0.60.7
 pkgrel=1
 pkgdesc="A spell checker designed to eventually replace Ispell (mingw-w64)"
 arch=('any')
@@ -17,42 +15,40 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libiconv"
          "${MINGW_PACKAGE_PREFIX}-gettext")
 options=('strip' 'staticlibs')
-source=("https://alpha.gnu.org/gnu/${_realname}/${_realname}-${_ver_base}-${_date_ver}.tar.gz"
+source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"
         0001-use-namespace.mingw.patch
         0002-printf.mingw.patch
         0003-no-undefined-on.mingw.patch
         0004-reloc.mingw.patch
         0005-w32-home.all.patch
         0006-abort.mingw.patch
-        0007-fix-including-langinfo.patch
-        0008-rearrange-includes-for-stat.patch)
-sha256sums=('49fd39624ba71af109567382d28aaf5643d0901f8ebc2ec6c3086a9423431766'
+        0007-fix-including-langinfo.patch)
+sha256sums=('5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4'
             '903c798d1afa40b4e36ec0d4c1b82a967d217507f03742c3c480568cc527e429'
             'ec5c71c96f9e8e299a818aae930a766832f52c431f44a7d42b0c69ad3cb18ffe'
             'b2c36f72abae7b31bf988fb9466543f0836aecbf84abcce09ca7c04c5e7fd4ff'
             '458bc2d9b2193fb6c40023d4656bee603ea5996ea55ba4b86ae337ca3fed2f2d'
             'c0cd30738e30de948b4cfc33f2b8672c7b57410f6c5bd04358fa9cfba29ab9c9'
             '34155f49b3cddd1e02e0d244cba286d97dab229088148261c2b5c499664ba299'
-            '8ff2cfc11963d0738c435a27c42e2f28dabf473270310f98ef6252a9707d4501'
-            'c6e59021da7920bf0e276bc00bff4287a0df2ba49c98d4b022e74fe7ba4a66d5')
+            '8ff2cfc11963d0738c435a27c42e2f28dabf473270310f98ef6252a9707d4501')
 
 prepare() {
-  cd "${srcdir}"/${_realname}-${_ver_base}-${_date_ver}
+  cd "${srcdir}"/${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/0001-use-namespace.mingw.patch
   patch -p1 -i ${srcdir}/0002-printf.mingw.patch
   patch -p1 -i ${srcdir}/0003-no-undefined-on.mingw.patch
   patch -p1 -i ${srcdir}/0004-reloc.mingw.patch
   patch -p1 -i ${srcdir}/0005-w32-home.all.patch
   patch -p1 -i ${srcdir}/0006-abort.mingw.patch
   patch -p1 -i ${srcdir}/0007-fix-including-langinfo.patch
-  patch -p1 -i ${srcdir}/0008-rearrange-includes-for-stat.patch
 
   autoreconf -fi
 }
 
 build() {
   CPPFLAGS+=" -DENABLE_W32_PREFIX=1"
-  mv ${_realname}-${_ver_base}-${_date_ver} build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST}
   cd "${srcdir}/build-${MINGW_CHOST}"
   ./configure \
     --prefix=${MINGW_PREFIX} \