NM:revert release

network/connection/NetworkManager/actions.py

@@ -11,29 +11,25 @@ from pisi.actionsapi import shelltools
 
 
 def setup():
-    autotools.autoreconf("-fiv")
+    # /var/run => /run
+    for f in ["configure.ac", "src/Makefile.am", "src/Makefile.in"]:
+        pisitools.dosed(f, "\$\(?localstatedir\)?(\/run\/(\$PACKAGE|NetworkManager))", "\\1")
+    pisitools.dosed("configure.ac", "\/var(\/run\/ConsoleKit)", "\\1")
+    pisitools.dosed("configure.ac", "^initscript", deleteLine=True)
+    autotools.autoreconf("-fi")
     shelltools.system("intltoolize --force --copy --automake")
 
     autotools.configure("--disable-static \
                          --disable-silent-rules \
                          --disable-wimax \
-                         --disable-ifcfg-rh \
-                         --disable-ifcfg-suse \
-                         --disable-ifnet \
-                         --disable-ifupdown \
                          --disable-lto \
+                         --disable-config-plugin-ibft \
+                         --disable-ifnet \
                          --disable-more-warnings \
-                         --enable-introspection \
-                         --enable-wifi \
                          --enable-modify-system \
                          --enable-ppp=yes \
-                         --enable-bluez5-dun \
+                         --enable-bluez5=yes \
                          --enable-concheck \
-                         --enable-config-plugin-ibft \
-                         --enable-vala=yes \
-                         --enable-json-validation \
-                         --enable-polkit \
-                         --enable-polkit-agent \
                          --without-netconfig \
                          --with-modem-manager-1 \
                          --with-libsoup=yes \
@@ -41,31 +37,30 @@ def setup():
                          --with-suspend-resume=upower \
                          --with-system-ca-path=/etc/ssl/certs \
                          --with-crypto=nss \
-                         --with-config-dhcp-default=/usr/bin/dhcpcd \
+                         --with-dhcpcd=/sbin/dhcpcd \
                          --with-pppd=/usr/sbin/pppd \
+                         --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
                          --with-dbus-sys-dir=/etc/dbus-1/system.d \
+                         --with-dhclient=/usr/sbin/dhclient \
                          --with-kernel-firmware-dir=/lib/firmware \
                          --with-udev-dir=/lib/udev \
                          --with-resolvconf=/etc/resolv.default.conf \
                          --with-iptables=/usr/sbin/iptables \
+                         --with-dnsmasq=/usr/sbin/dnsmasq \
                          --with-systemdsystemunitdir=no \
                          --with-nmtui \
-                         --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
-                         --without-valgrind \
                          --localstatedir=/var \
                          --sysconfdir=/etc \
                          --libexecdir=/usr/lib/NetworkManager \
-                         --with-dhcpcd=/usr/bin/dhcpcd \
-                         --without-dhclient \
-                        " )
+                        ")
 
-    pisitools.dosed("libtool", "-shared", "-Wl, --as-needed -shared")
+    pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
 
 def build():
     autotools.make()
 
 #def check():
-    #autotools.make("check")
+    #autotools.make("-k check")
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())