Force GCC to use C++03 standard

2 files changed, 21 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ef085c11cc0..a2f98a222edb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = vmware-component-extractor-git
 	pkgdesc = Extract VMware Tools ISO from component file
 	pkgver = 0.2.b3b995a
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/17twenty/VMWare-Component-Extractor
 	arch = i686
 	arch = x86_64
 	license = custom
+	provides = vmware-component-extractor=0.2.b3b995a
+	conflicts = vmware-component-extractor
 	source = vmware-component-extractor-git::git+https://github.com/17twenty/VMWare-Component-Extractor#branch=master
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = vmware-component-extractor-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b2ed756ed6cd..8826e8e05033 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,37 @@
-# Maintainer: Gavin Lloyd <gavinhungry@gmail.com>
+# Maintainer: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com>
+# Contributor: Gavin Lloyd <gavinhungry@gmail.com>
 
-pkgname=vmware-component-extractor-git
+_pkgname=vmware-component-extractor
+pkgname=${_pkgname}-git
 pkgver=0.2.b3b995a
-pkgrel=1
+pkgrel=2
 pkgdesc="Extract VMware Tools ISO from component file"
 arch=('i686' 'x86_64')
 license=('custom')
 url='https://github.com/17twenty/VMWare-Component-Extractor'
-depends=()
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
 source=("${pkgname}::git+https://github.com/17twenty/VMWare-Component-Extractor#branch=master")
-md5sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver () {
   cd "${srcdir}/${pkgname}"
   echo "0.$(git rev-list --count HEAD).$(git describe --always | sed 's|-|.|g')"
 }
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}"
+  sed -i -e 's/\$(CXX)/\$(CXX) $(CXXFLAGS)/' Makefile
+}
+
+build()
+{
+  cd "${srcdir}/${pkgname}"
+  export CXXFLAGS="$CXXFLAGS -std=c++03"
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
-  install -d "${pkgdir}"/usr/bin/
-  install -m755 VMWareComponentExtractor "${pkgdir}"/usr/bin/
+  install -Dm 755 VMWareComponentExtractor "$pkgdir"/usr/bin/vmware-component-extractor
 }