Merge branch 'master' of github.com:pisilinux/main

network/connection/NetworkManager/pspec.xml

@@ -18,7 +18,7 @@
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency>intltool</Dependency>
-            <Dependency>dhclient</Dependency>
+            <!--Dependency>dhclient</Dependency-->
             <Dependency>ppp-devel</Dependency>
             <Dependency>nss-devel</Dependency>
             <Dependency>newt-devel</Dependency>
@@ -55,8 +55,8 @@
             <Dependency>polkit</Dependency>
             <Dependency>readline</Dependency>
             <Dependency>dbus-glib</Dependency>
-            <Dependency>libuuid</Dependency>
-            <Dependency>libgudev1</Dependency>
+            <Dependency>libutil-linux</Dependency>
+            <Dependency>eudev</Dependency>
             <Dependency>nss</Dependency>
             <Dependency>newt</Dependency>
             <Dependency>ppp</Dependency>

network/share/rsync/actions.py

@@ -11,13 +11,15 @@ from pisi.actionsapi import get
 WorkDir="rsync-%s" % get.srcVERSION().replace('_','')
 
 def setup():
-    autotools.configure("--without-included-zlib")
+    autotools.configure("--without-included-zlib \
+                         --with-included-popt=no \
+                         --disable-debug")
 
 def build():
     autotools.make()
 
-def check():
-    autotools.make("check")
+#def check():
+#    autotools.make("test")
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())

network/share/rsync/pspec.xml

@@ -14,10 +14,22 @@
         <Summary>File transfer program to keep local copies in sync with remote files</Summary>
         <Description>rsync is a tool to keep local copies of remote files in sync (i.e. make sure local files are exact copies of remote files).</Description>
         <Archive sha1sum="c84faba04f721d393feccfa0476bfeed9b5b5250" type="targz">http://rsync.samba.org/ftp/rsync/rsync-3.1.1.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>acl-devel</Dependency>
+            <Dependency>attr-devel</Dependency>
+            <Dependency>popt-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
+        </BuildDependencies>
     </Source>
 
     <Package>
         <Name>rsync</Name>
+        <RuntimeDependencies>
+            <Dependency>acl</Dependency>
+            <Dependency>attr</Dependency>
+            <Dependency>popt</Dependency>
+            <Dependency>zlib</Dependency>
+        </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="doc">/usr/share/doc</Path>