Merge pull request #2960 from ayhanyalcinsoy/master

NM:v.bump to 1.6.2

network/connection/NetworkManager/actions.py

@@ -11,12 +11,7 @@ from pisi.actionsapi import shelltools
 
 
 def setup():
-    # /var/run => /run
+    autotools.autoreconf("-fiv")
-    # 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 \
@@ -28,6 +23,7 @@ def setup():
                          --disable-ifupdown \
                          --disable-lto \
                          --disable-more-warnings \
+                         --enable-introspection \
                          --enable-wifi \
                          --enable-modify-system \
                          --enable-ppp=yes \
@@ -45,7 +41,7 @@ def setup():
                          --with-suspend-resume=upower \
                          --with-system-ca-path=/etc/ssl/certs \
                          --with-crypto=nss \
-                         --with-config-dhcp-default=/usr/sbin/dhcpcd \
+                         --with-config-dhcp-default=/usr/bin/dhcpcd \
                          --with-pppd=/usr/sbin/pppd \
                          --with-dbus-sys-dir=/etc/dbus-1/system.d \
                          --with-kernel-firmware-dir=/lib/firmware \
@@ -59,9 +55,11 @@ def setup():
                          --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()

network/connection/NetworkManager/pspec.xml

@@ -12,9 +12,9 @@
         <IsA>app:console</IsA>
         <Summary>Network connection manager powered by D-Bus and UDEV</Summary>
         <Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
-        <Archive sha1sum="c27457c3ff3a91f7fa4b51f6b24372715fc54a40" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.4/NetworkManager-1.4.4.tar.xz</Archive>
+        <Archive sha1sum="fee830aee4b8d719046add91efa13ac08648b017" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.6/NetworkManager-1.6.2.tar.xz</Archive>
         <AdditionalFiles>
-             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
+<!--             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> -->
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency>intltool</Dependency>
@@ -45,11 +45,15 @@
             <Dependency>libutil-linux-devel</Dependency>
             <Dependency versionFrom="0.9.2">ConsoleKit-devel</Dependency>
             <Dependency>gtk-doc</Dependency>
+            <Dependency>gobject-introspection-devel</Dependency>
+            <Dependency>python-pygobject3-devel</Dependency>
+            <Dependency>upower-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
         </BuildDependencies>
         <Patches>
              <!--<Patch>0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch</Patch>-->
              <!--Patch>0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch</Patch-->
-            <Patch>disable_set_hostname.patch</Patch>
+<!--             <Patch>disable_set_hostname.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -131,6 +135,16 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2017-02-23</Date>
+            <Version>1.6.2</Version>
+            <Comment>Version Bump.</Comment>
+            <Requires>
+                <Action package="NetworkManager">systemRestart</Action>
+            </Requires>
+            <Name>Ayhan Yalçınsoy</Name>
+            <Email>ayhanyalcinsoy@pisilinux.org</Email>
+        </Update>
         <Update release="5">
             <Date>2017-02-21</Date>
             <Version>1.4.4</Version>