Fix build.

2 files changed, 102 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cbf2ad31850..62cefe2509a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -46,3 +46,99 @@ pkgname = network-manager-applet-passwordstore
 	provides = network-manager-applet=1.4.0-1
 	conflicts = network-manager-applet
 
+pkgbase = network-manager-applet-passwordstore
+	pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users
+	pkgver = 1.4.0
+	pkgrel = 1
+	url = https://wiki.gnome.org/Projects/NetworkManager/
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	license = LGPL2.1
+	makedepends = libsecret
+	makedepends = libnotify
+	makedepends = libmm-glib
+	makedepends = intltool
+	makedepends = gobject-introspection
+	depends = libnm-glib
+	depends = libgudev
+	depends = gtk3
+	depends = mobile-broadband-provider-info
+	depends = iso-codes
+	provides = nm-connection-editor=-
+	provides = network-manager-applet=-
+	conflicts = nm-connection-editor
+	conflicts = network-manager-applet
+	options = !emptydirs
+	source = http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.4/network-manager-applet-1.4.0.tar.xz
+	source = enable-local-password-storage.patch
+	source = enable-new-connections-for-everyone-as-default.patch
+	sha256sums = d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331
+	sha256sums = ae7232742e24d87c664479dac655c93a76db8dbbe52359144de21f573ed784c8
+	sha256sums = b4c585b9beaac036e2b441d8952a99dd9f2532eeb3ba50081ca69761ffb40439
+
+pkgname = nm-connection-editor-passwordstore
+	pkgdesc = NetworkManager GUI connection editor with default settings to save authentication passwords in keyfile and make all new connections available for all users
+	provides = libnm-gtk=1.4.0-1
+	provides = nm-connection-editor=1.4.0-1
+	conflicts = libnm-gtk
+	conflicts = nm-connection-editor
+	replaces = libnm-gtk
+
+pkgname = network-manager-applet-passwordstore
+	pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users
+	depends = nm-connection-editor-passwordstore
+	depends = libmm-glib
+	depends = libnotify
+	depends = libsecret
+	provides = network-manager-applet=1.4.0-1
+	conflicts = network-manager-applet
+
+pkgbase = network-manager-applet-passwordstore
+	pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users
+	pkgver = 1.4.0
+	pkgrel = 1
+	url = https://wiki.gnome.org/Projects/NetworkManager/
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	license = LGPL2.1
+	makedepends = libsecret
+	makedepends = libnotify
+	makedepends = libmm-glib
+	makedepends = intltool
+	makedepends = gobject-introspection
+	depends = libnm-glib
+	depends = libgudev
+	depends = gtk3
+	depends = mobile-broadband-provider-info
+	depends = iso-codes
+	provides = nm-connection-editor=-
+	provides = network-manager-applet=-
+	conflicts = nm-connection-editor
+	conflicts = network-manager-applet
+	options = !emptydirs
+	source = http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/1.4/network-manager-applet-1.4.0.tar.xz
+	source = enable-local-password-storage.patch
+	source = enable-new-connections-for-everyone-as-default.patch
+	sha256sums = d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331
+	sha256sums = ae7232742e24d87c664479dac655c93a76db8dbbe52359144de21f573ed784c8
+	sha256sums = b4c585b9beaac036e2b441d8952a99dd9f2532eeb3ba50081ca69761ffb40439
+
+pkgname = nm-connection-editor-passwordstore
+	pkgdesc = NetworkManager GUI connection editor with default settings to save authentication passwords in keyfile and make all new connections available for all users
+	provides = libnm-gtk=1.4.0-1
+	provides = nm-connection-editor=1.4.0-1
+	conflicts = libnm-gtk
+	conflicts = nm-connection-editor
+	replaces = libnm-gtk
+
+pkgname = network-manager-applet-passwordstore
+	pkgdesc = Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users
+	depends = nm-connection-editor-passwordstore
+	depends = libmm-glib
+	depends = libnotify
+	depends = libsecret
+	provides = network-manager-applet=1.4.0-1
+	conflicts = network-manager-applet
+
diff --git a/PKGBUILD b/PKGBUILD
index 1f76d512becf..363f093a5049 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,6 +2,7 @@
 # Maintainer: Oskari Rauta <oskari.rauta dot gmail.com>
 
 pkgbase=network-manager-applet-passwordstore
+_pkgbase="network-manager-applet"
 pkgname=(nm-connection-editor-passwordstore network-manager-applet-passwordstore)
 pkgdesc="Applet for managing network connections with default setting to save authentication passwords in keyfile and make all new connections available for all users"
 conflicts=('nm-connection-editor' 'network-manager-applet')
@@ -14,7 +15,7 @@ license=(GPL2 LGPL2.1)
 depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes)
 makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection)
 options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbase/${pkgver:0:3}/$_pkgbase-$pkgver.tar.xz
 	enable-local-password-storage.patch
 	enable-new-connections-for-everyone-as-default.patch)
 sha256sums=('d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331'
@@ -24,13 +25,13 @@ sha256sums=('d9f5f1e151b8edbbcebb6f818eed9a49b53aadcb4e8aed2cae4fc09996278331'
 prepare() {
   mkdir -p nma/etc/xdg nma/usr/bin \
     nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
-  cd $pkgbase-$pkgver
+  cd $_pkgbase-$pkgver
   patch -p1 -i ../enable-new-connections-for-everyone-as-default.patch
   patch -p1 -i ../enable-local-password-storage.patch
 }
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgbase-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/networkmanager \
@@ -46,7 +47,7 @@ build() {
 }
 
 check() {
-  cd $pkgbase-$pkgver
+  cd $_pkgbase-$pkgver
   make -k check
 }
 
@@ -56,7 +57,7 @@ package_nm-connection-editor-passwordstore() {
   conflicts=('libnm-gtk' 'nm-connection-editor')
   replaces=('libnm-gtk')
 
-  cd $pkgbase-$pkgver
+  cd $_pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
 ### Split network-manager-applet