diff --git a/desktop/kde/framework/kbookmarks/pspec.xml b/desktop/kde/framework/kbookmarks/pspec.xml index 05a8941eea..8e3d01d322 100755 --- a/desktop/kde/framework/kbookmarks/pspec.xml +++ b/desktop/kde/framework/kbookmarks/pspec.xml @@ -15,9 +15,18 @@ http://download.kde.org/stable/frameworks/5.11/kbookmarks-5.11.0.tar.xz qt5-base-devel - python3 - qt5-tools-devel - extra-cmake-modules + python3 + qt5-tools-devel + kcoreaddons-devel + kauth-devel + kcodecs-devel + kconfig-devel + kconfigwidgets-devel + kiconthemes-devel + kwidgetsaddons-devel + kxmlgui-devel + extra-cmake-modules + cmake @@ -25,35 +34,35 @@ kbookmarks qt5-base - libgcc - kcoreaddons - kcodecs - kconfig - kiconthemes - kwidgetsaddons - kxmlgui + libgcc + kcoreaddons + kcodecs + kconfig + kiconthemes + kwidgetsaddons + kxmlgui - /etc + /etc /usr/share - /usr/share/locale - /usr/lib/qt5 - /usr/lib + /usr/share/locale + /usr/lib/qt5 + /usr/lib /usr/share/doc kbookmarks-devel - Development files for kbookmarks + Development files for kbookmarks - qt5-base-devel + qt5-base-devel kbookmarks /usr/include /usr/lib/cmake - /usr/lib/pkgconfig + /usr/lib/pkgconfig diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py index 45e031c87d..6f38db4394 100644 --- a/hardware/virtualization/docker/actions.py +++ b/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,14 +24,14 @@ def build(): shelltools.system("./hack/make.sh dynbinary") def install(): - pisitools.dobin("bundles/1.7.0/dynbinary/docker") - pisitools.dobin("bundles/1.7.0/dynbinary/docker-1.7.0") - pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit", "/usr/libexec/docker") - pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit-1.7.0", "/usr/libexec/docker") + pisitools.dobin("bundles/1.7.1/dynbinary/docker") + pisitools.dobin("bundles/1.7.1/dynbinary/docker-1.7.1") + pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit", "/usr/lib/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") - + #insert contrib in docs pisitools.insinto("/usr/share/doc/docker", "contrib") diff --git a/hardware/virtualization/docker/comar/package.py b/hardware/virtualization/docker/comar/package.py index a558a9b0d4..caab7a5eed 100644 --- a/hardware/virtualization/docker/comar/package.py +++ b/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) diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index 26d23d61af..1227df184e 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -13,7 +13,7 @@ Pack, ship and run any application as a lightweight container An open platform for distributed applications for developers and sysadmins - https://github.com/docker/docker/archive/v1.7.0.tar.gz + https://github.com/docker/docker/archive/v1.7.1.tar.gz git golang @@ -39,7 +39,7 @@ /etc /usr/bin/ - /usr/libexec/docker + /usr/lib/docker /usr/share/ @@ -54,6 +54,13 @@ + + 2015-07-24 + 1.7.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-06-24 1.7.0