Update to 12.0.7

Correct the --prefix to not include $pkgdir

3 files changed, 12 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 890bfc29f0d0..498cc8785257 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
 pkgbase = qdecoder
 	pkgdesc = qDecoder is a CGI library for C/C++ programming language which has been developed since 1996.
-	pkgver = 12.0.6
+	pkgver = 12.0.7
 	pkgrel = 1
 	url = https://wolkykim.github.io/qdecoder/
 	arch = x86_64
-	arch = i686
 	license = CUSTOM
 	makedepends = fcgi
-	source = https://github.com/wolkykim/qdecoder/archive/r12.0.6.tar.gz
-	source = Makefile.patch
-	sha256sums = e2aaec44b3469baa32b7659c804c7d71da5fbfb0eefa456dbd45ebaf77675a80
-	sha256sums = 6cc0f82417c46e80dd87b3fb3621dbc0ed7ce85c8cc6bba856cb18f6cb2e376f
+	source = https://github.com/wolkykim/qdecoder/archive/v12.0.7.tar.gz
+	sha256sums = 01d4852b9343757abe98bbdb9d4bf0dc142ccb602ec921906ddde32c16164376
 
 pkgname = qdecoder
 
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 20b0bd8aa7cb..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur qdecoder-r12.0.6/src/Makefile.in qdecoder-new/src/Makefile.in
---- qdecoder-r12.0.6/src/Makefile.in	2017-01-23 12:53:48.000000000 -0500
-+++ qdecoder-new/src/Makefile.in	2017-03-05 07:23:26.076652016 -0500
-@@ -84,14 +84,14 @@
- 	${LN_S} -f ${SLIBREALNAME} ${SLIBNAME}
- 
- install: all
--	${MKDIR} -p ${HEADERDIR}
--	${MKDIR} -p ${LIBDIR}
--	${MKDIR} -p ${PKGCONFIGDIR}
--	${INSTALL_DATA} qdecoder.h ${HEADERDIR}/qdecoder.h
--	${INSTALL_DATA} ${LIBNAME} ${LIBDIR}/${LIBNAME}
--	${INSTALL_DATA} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME}
--	${INSTALL_DATA} ${PKGCONFIGNAME} ${PKGCONFIGDIR}/${PKGCONFIGNAME}
--	( cd ${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} )
-+	${MKDIR} -p ${DESTDIR}${HEADERDIR}
-+	${MKDIR} -p ${DESTDIR}${LIBDIR}
-+	${MKDIR} -p ${DESTDIR}${PKGCONFIGDIR}
-+	${INSTALL_DATA} qdecoder.h ${DESTDIR}${HEADERDIR}/qdecoder.h
-+	${INSTALL_DATA} ${LIBNAME} ${DESTDIR}${LIBDIR}/${LIBNAME}
-+	${INSTALL_DATA} ${SLIBREALNAME} ${DESTDIR}${LIBDIR}/${SLIBREALNAME}
-+	${INSTALL_DATA} ${PKGCONFIGNAME} ${DESTDIR}${PKGCONFIGDIR}/${PKGCONFIGNAME}
-+	( cd ${DESTDIR}${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} )
- 
- deinstall: uninstall
- uninstall:
diff --git a/PKGBUILD b/PKGBUILD
index b095feea3d9e..dc4fc2893940 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,31 @@
 # Maintainer: Aaron Bishop < erroneous at gmail >
 
 pkgname=qdecoder
-pkgver=12.0.6
+pkgver=12.0.7
 pkgrel=1
 pkgdesc="qDecoder is a CGI library for C/C++ programming language which has been developed since 1996."
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url="https://wolkykim.github.io/qdecoder/"
 license=('CUSTOM')
 depends=()
 makedepends=('fcgi')
-source=("https://github.com/wolkykim/qdecoder/archive/r${pkgver}.tar.gz"
-        #Patch provided by amish corrects destdir
-        "Makefile.patch")
-sha256sums=('e2aaec44b3469baa32b7659c804c7d71da5fbfb0eefa456dbd45ebaf77675a80'
-            '6cc0f82417c46e80dd87b3fb3621dbc0ed7ce85c8cc6bba856cb18f6cb2e376f')
+source=("https://github.com/wolkykim/qdecoder/archive/v${pkgver}.tar.gz")
+sha256sums=('01d4852b9343757abe98bbdb9d4bf0dc142ccb602ec921906ddde32c16164376')
 
 
 prepare() {
-    cd "${srcdir}/${pkgname}-r${pkgver}"
-    patch -p1 < ../Makefile.patch
-    ./configure --enable-fastcgi=/usr/include --prefix="${pkgdir}/usr"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./configure --enable-fastcgi=/usr/include --prefix="/usr"
 }
 
 build() {
-    cd "${srcdir}/${pkgname}-r${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-r${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     mkdir -p "$pkgdir/usr/share/licenses/${pkgname}" "$pkgdir/usr/include" "$pkgdir/usr/lib"
-    make install
+    make DESTDIR="$pkgdir" install
     install -Dm644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
 }