summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD48
-rw-r--r--connman-nmcompat.install4
3 files changed, 17 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d77e502d5a6e..e286d26c40d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,15 @@
pkgbase = connman-nmcompat
- pkgdesc = Connman network manager with NetworkManager compatibility for all NetworkManager aware applications
+ pkgdesc = Transition package. Connman network manager with NetworkManager compatibility for all NetworkManager aware applications
pkgver = 1.33
- pkgrel = 1
+ pkgrel = 2
url = https://01.org/connman
arch = i686
arch = x86_64
license = GPL2
- makedepends = bluez
- makedepends = wpa_supplicant
- makedepends = openconnect
- makedepends = openvpn
- makedepends = ppp
- depends = dbus
- depends = iptables
- depends = gnutls
- depends = glib2
- optdepends = bluez: Support for Bluetooth devices
- optdepends = wpa_supplicant: For WiFi devices
- optdepends = pptpclient: for ppp support
- provides = connman
- source = http://www.kernel.org/pub/linux/network/connman/connman-1.33.tar.xz
- source = allow_group_network.diff
- md5sums = c51903fd3e7a6a371d12ac5d72a1fa01
- md5sums = a8d22ee089fb0ed725130d16ad393047
+ depends = connman
+ source = connman-nmcompat.install
+ md5sums = 6b4e71ea46e1d65eea4f9c2185295d55
pkgname = connman-nmcompat
+ install = connman-nmcompat.install
diff --git a/PKGBUILD b/PKGBUILD
index f8c9a9b26126..f012e6134a8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,49 +7,15 @@
basepkgname=connman
pkgname=${basepkgname}-nmcompat
pkgver=1.33
-pkgrel=1
-pkgdesc="Connman network manager with NetworkManager compatibility for all NetworkManager aware applications"
+pkgrel=2
+pkgdesc="Transition package. Connman network manager with NetworkManager compatibility for all NetworkManager aware applications"
url="https://01.org/connman"
arch=('i686' 'x86_64')
license=('GPL2')
-provides=('connman')
-depends=('dbus' 'iptables' 'gnutls' 'glib2')
-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/${basepkgname}/${basepkgname}-${pkgver}.tar.xz" 'allow_group_network.diff')
-md5sums=('c51903fd3e7a6a371d12ac5d72a1fa01'
- 'a8d22ee089fb0ed725130d16ad393047')
-
-prepare(){
- cd $basepkgname-$pkgver
- patch -Np1 -i "$srcdir/allow_group_network.diff"
-}
-
-build() {
- cd $basepkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --bindir=/usr/bin \
- --sbindir=/usr/bin \
- --with-systemdunitdir=/usr/lib/systemd/system \
- --enable-pptp \
- --enable-openconnect \
- --enable-vpnc \
- --enable-openvpn \
- --enable-polkit \
- --enable-nmcompat \
- --enable-client
-
- make
-}
-
+#provides=('connman')
+depends=('connman')
+source=("connman-nmcompat.install")
+md5sums=('6b4e71ea46e1d65eea4f9c2185295d55')
package() {
- 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
- rm -r "$pkgdir"/usr/lib/tmpfiles.d
+ install=connman-nmcompat.install
}
diff --git a/connman-nmcompat.install b/connman-nmcompat.install
new file mode 100644
index 000000000000..ad97e9c3a668
--- /dev/null
+++ b/connman-nmcompat.install
@@ -0,0 +1,4 @@
+post_upgrade() {
+ printf "*********************************************************************************************\n"
+ printf "Now that the Official Arch package has Network Manager compatibility build in, you should remove this package as it will be going away soon. This package update was just a transition package to the official connman package\n\n\n\n"
+}