From bc9e0122db27b7d7f5c5e87d45b98941acd84353 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 Mar 2013 12:49:16 +0100 Subject: [PATCH] systemd: update to 198. --- srcpkgs/libudev/template | 9 +++++---- srcpkgs/systemd-analyze | 1 - srcpkgs/systemd/systemd-analyze.template | 9 --------- srcpkgs/systemd/template | 19 ++++++++++--------- 4 files changed, 15 insertions(+), 23 deletions(-) delete mode 120000 srcpkgs/systemd-analyze delete mode 100644 srcpkgs/systemd/systemd-analyze.template diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template index cc6d9dd82f4..1f1c8224e9c 100644 --- a/srcpkgs/libudev/template +++ b/srcpkgs/libudev/template @@ -1,7 +1,7 @@ # Template file for 'libudev' pkgname=libudev -version=197 -revision=2 +version=198 +revision=1 wrksrc="systemd-${version}" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux @@ -21,8 +21,9 @@ short_desc="udev shared library" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" -distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" -checksum=e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 +#distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" +distfiles="http://pkgs.fedoraproject.org/repo/pkgs/systemd/systemd-${version}.tar.xz/26a75e2a310f8c1c1ea9ec26ddb171c5/systemd-${version}.tar.xz" +checksum=444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf if [ -n "$XBPS_CROSS_TRIPLET" ]; then makedepends="automake gettext-devel pkg-config intltool diff --git a/srcpkgs/systemd-analyze b/srcpkgs/systemd-analyze deleted file mode 120000 index 1514658181d..00000000000 --- a/srcpkgs/systemd-analyze +++ /dev/null @@ -1 +0,0 @@ -systemd \ No newline at end of file diff --git a/srcpkgs/systemd/systemd-analyze.template b/srcpkgs/systemd/systemd-analyze.template deleted file mode 100644 index d3e6abad8bd..00000000000 --- a/srcpkgs/systemd/systemd-analyze.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'systemd-analyze'. -# -noarch=yes -depends="python dbus-python pygobject gir-freedesktop systemd>=${version}" -short_desc="A python utility to analyze some systemd results" - -do_install() { - vmove usr/bin/systemd-analyze usr/bin -} diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 948c24b1f60..51173aa14dc 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,13 +1,13 @@ # Template file for 'systemd' pkgname=systemd -version=197 -revision=7 +version=198 +revision=1 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux --disable-tcpwrap --with-rootprefix=/usr --with-sysvinit-path= --with-sysvrcnd-path= --disable-audit --disable-static --disable-ima" -depends="dbus kbd libcap-progs" +depends="dbus kbd libcap-progs libudev>=${version} systemd-libs>=${version}" makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel qrencode-devel @@ -16,11 +16,12 @@ short_desc="A system and service manager for Linux" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" -distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" -checksum=e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 +#distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" +distfiles="http://pkgs.fedoraproject.org/repo/pkgs/systemd/systemd-${version}.tar.xz/26a75e2a310f8c1c1ea9ec26ddb171c5/systemd-${version}.tar.xz" +checksum=444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf -replaces="nss-myhostname>=0" -subpackages="libgudev libgudev-devel systemd-analyze systemd-python" +replaces="nss-myhostname>=0 systemd-analyze>0" +subpackages="libgudev libgudev-devel systemd-python" conf_files=" /etc/hostname @@ -33,8 +34,8 @@ conf_files=" /etc/udev/udev.conf" if [ -n "$XBPS_CROSS_TRIPLET" ]; then - # XXX add support to gudev, introspectin and python. - subpackages="systemd-analyze" + # XXX add support to gudev, introspection and python. + unset subpackages makedepends="automake gettext-devel pkg-config intltool gperf libxslt docbook-xsl libgcrypt-devel" crossmakedepends="acl-devel pam-devel dbus-devel libcap-devel