correct a few things and add some stuff to .git ignore generated by the build. package is fully working

3 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd4e4b6328ac..16cbc4cdb3ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,7 @@ pkgbase = connman-nmcompat
 	optdepends = wpa_supplicant: For WiFi devices
 	optdepends = pptpclient: for ppp support
 	provides = connman
-	source = http://www.kernel.org/pub/linux/network/connman-nmcompat/connman-nmcompat-1.33.tar.xz
+	source = http://www.kernel.org/pub/linux/network/connman/connman-1.33.tar.xz
 	source = allow_group_network.diff
 	md5sums = c51903fd3e7a6a371d12ac5d72a1fa01
 	md5sums = a8d22ee089fb0ed725130d16ad393047
diff --git a/.gitignore b/.gitignore
index 80cbbe501104..97ca78ac79da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-*.pkg.tar.xz
+*.pkg.tar.*
+connman-*.tar.xz
 src/
 build/
+pkg/
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index eced73b98ef1..317c1f1e1ff2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 #
 # Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
-
-pkgname=connman-nmcompat
+basepkgname=connman
+pkgname=${basepkgname}-nmcompat
 pkgver=1.33
 pkgrel=1
 pkgdesc="Connman network manager with NetworkManager compatibility for all NM aware applications"
@@ -18,17 +18,17 @@ optdepends=('bluez: Support for Bluetooth devices'
             'wpa_supplicant: For WiFi devices'
             'pptpclient: for ppp support')
 makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp')
-source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'allow_group_network.diff')
+source=("http://www.kernel.org/pub/linux/network/${basepkgname}/${basepkgname}-${pkgver}.tar.xz" 'allow_group_network.diff')
 md5sums=('c51903fd3e7a6a371d12ac5d72a1fa01'
          'a8d22ee089fb0ed725130d16ad393047')
 
 prepare(){
-  cd $pkgname-$pkgver
+  cd $basepkgname-$pkgver
   patch -Np1 -i "$srcdir/allow_group_network.diff"
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $basepkgname-$pkgver
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --bindir=/usr/bin \
@@ -46,8 +46,8 @@ build() {
 }
 
 package() {
-  make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/bin/${pkgname}ctl"
+  make -C $basepkgname-$pkgver DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/$basepkgname-$pkgver/client/${basepkgname}ctl" "$pkgdir/usr/bin/${basepkgname}ctl"
   find "$pkgdir/usr" -name \*.service -exec sed -i 's/s\(bin\)/\1/' {} +
 # See FS#48044
   sed -i 's/ProtectSystem=full/ProtectSystem=true/' "$pkgdir"/usr/lib/systemd/system/connman.service