Merge pull request #141 from ertugerata/master

index 25Temmuz

components.xml

@@ -1100,6 +1100,39 @@
                 <Email>admins@pisilinux.org</Email>
             </Maintainer>
         </Component>
+	<Component>
+            <Name>desktop.kde.framework</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>kde.desktop</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+	<Component>
+            <Name>desktop.kde.application</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>kde.desktop</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+	<Component>
+            <Name>desktop.kde.plasma</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>kde.desktop</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
         <Component>
             <Name>desktop.kde.network</Name>
             <LocalName xml:lang="en">FIXME</LocalName>

desktop/kde/framework/kbookmarks/pspec.xml

@@ -17,7 +17,16 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>python3</Dependency>
             <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+	    <Dependency>kauth-devel</Dependency>
+            <Dependency>kcodecs-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>kxmlgui-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 

desktop/kde/framework/kconfigwidgets/pspec.xml

@@ -19,18 +19,26 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>python3</Dependency>
             <Dependency>ki18n-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kcodecs-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kguiaddons-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>docbook-xml</Dependency>
+            <Dependency>docbook-xsl</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>	
     </Source>
 
     <Package>
         <Name>kconfigwidgets</Name>
         <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>kauth</Dependency>
             <Dependency>kcodecs</Dependency>
-	    <Dependency>kdoctools</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>kcoreaddons</Dependency>
             <Dependency>kguiaddons</Dependency>

desktop/kde/framework/kglobalaccel/pspec.xml

@@ -17,7 +17,18 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-tools-devel</Dependency>
             <Dependency>python3</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>kcrash-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kdbusaddons-devel</Dependency>
+            <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -27,7 +38,6 @@
             <Dependency>qt5-base</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libxcb</Dependency>
-	    <Dependency>ki18n</Dependency>
             <Dependency>kcrash</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>qt5-x11extras</Dependency>

desktop/kde/framework/kiconthemes/pspec.xml

@@ -17,13 +17,23 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>python3</Dependency>
+            <Dependency>qt5-svg-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kcodecs-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kitemviews-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>kiconthemes</Name>
         <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>qt5-svg</Dependency>
             <Dependency>kconfigwidgets</Dependency>

desktop/kde/framework/ktextwidgets/pspec.xml

@@ -17,7 +17,20 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>	    
             <Dependency>python3</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kcompletion-devel</Dependency>
+            <Dependency>kcodecs-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>sonnet-devel</Dependency>
+            <Dependency>kservice-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 

desktop/kde/framework/kxmlgui/pspec.xml

@@ -16,7 +16,23 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>python3</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>attica-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kcodecs-devel</Dependency>
+            <Dependency>sonnet-devel</Dependency>
+            <Dependency>kglobalaccel-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kitemviews-devel</Dependency>
+            <Dependency>ktextwidgets-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>	
     </Source>
 

desktop/toolkit/qt5/component.xml

@@ -1,3 +1,3 @@
 <PISI>
-    <Name>qt5</Name>
+    <Name>desktop.toolkit.qt5</Name>
 </PISI>

desktop/toolkit/qt5/qt5-svg/pspec.xml

@@ -37,6 +37,7 @@
         <Name>qt5-svg-devel</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base-devel</Dependency>
+	    <Dependency release="current">qt5-svg</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/pkgconfig</Path>

hardware/virtualization/docker/actions.py

@@ -10,13 +10,13 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 shelltools.export("AUTO_GOPATH", "1")
-shelltools.export("DOCKER_GITCOMMIT", "0baf609") #DOCKER_GITCOMMIT="0baf609"
+shelltools.export("DOCKER_GITCOMMIT", "786b29d") 
 shelltools.export("GOPATH", "%s" % get.workDIR())
 
 shelltools.export("CGO_CFLAGS", "-I/usr/include")
 shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
 shelltools.export("DOCKER_BUILDTAGS","exclude_graphdriver_aufs")
-shelltools.export("DOCKER_INITPATH", "/usr/libexec/docker/dockerinit")
+shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
   
 NoStrip=["/"]
 
@@ -24,10 +24,10 @@ def build():
     shelltools.system("./hack/make.sh dynbinary")
 
 def install():
-    pisitools.dobin("bundles/1.7.0/dynbinary/docker")
+    pisitools.dobin("bundles/1.7.1/dynbinary/docker")
-    pisitools.dobin("bundles/1.7.0/dynbinary/docker-1.7.0")
+    pisitools.dobin("bundles/1.7.1/dynbinary/docker-1.7.1")
-    pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit", "/usr/libexec/docker")
+    pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit", "/usr/lib/docker")
-    pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit-1.7.0", "/usr/libexec/docker")
+    pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit-1.7.1", "/usr/lib/docker")
 
     # insert udev rules
     pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")

hardware/virtualization/docker/comar/package.py

@@ -11,6 +11,7 @@ logfile = "/var/log/docker.log"
 def postInstall(fromVersion, fromRelease, toVersion, toRelease):
     try:
         os.system ("usr/sbin/groupadd -g %d %s" % (OUR_ID, OUR_NAME))
+        os.system ("usr/sbin/usermod -aG %d %s" % (OUR_ID, OUR_NAME))
         os.system("/bin/touch %s" % logfile)
         os.system("/bin/chown root:docker %s" % logfile)
         os.system("chmod 0644 %s" % logfile)

hardware/virtualization/docker/pspec.xml

@@ -13,7 +13,7 @@
         <Summary>Pack, ship and run any application as a lightweight container</Summary>
         <Description>An open platform for distributed applications for developers and sysadmins</Description>
         <!--fix sha1sum-->
-        <Archive sha1sum="e638f39c6081de7b0903ed09096300bdbb1d5aa0" type="targz">https://github.com/docker/docker/archive/v1.7.0.tar.gz</Archive>
+        <Archive sha1sum="93a7dffdc434af3ba38104a1d3ae445212ae8c0d" type="targz">https://github.com/docker/docker/archive/v1.7.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
             <Dependency>golang</Dependency>
@@ -39,7 +39,7 @@
         <Files>
             <Path fileType="config">/etc</Path>  
             <Path fileType="executable">/usr/bin/</Path>
-            <Path fileType="library">/usr/libexec/docker</Path>
+            <Path fileType="library">/usr/lib/docker</Path>
             <Path fileType="data">/usr/share/</Path>
         </Files>
         <AdditionalFiles>
@@ -54,6 +54,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2015-07-24</Date>
+            <Version>1.7.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2015-06-24</Date>
             <Version>1.7.0</Version>

pisi-index.xml.sha1sum

@@ -1 +1 @@
-3a838496add0e916eefa44a9071f97c485944045
+3ff1fa7e983ec3ef1c03333f6425390c1a86e982

pisi-index.xml.xz.sha1sum

@@ -1 +1 @@
-93f1468387f03fc2064e11a6d0ed8f5771bbced7
+22bf6e793832fe84aa0cebe59c948ceaaac7791f