Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=8d73370435dba1e433fb4658e1ea576dffb5fbb1
commit 8d73370435dba1e433fb4658e1ea576dffb5fbb1 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Mar 18 21:59:23 2011 +0100 accountsservice-0.6.6-1-i686 *version bump *fixes create user *remove useless syvinit support diff --git a/source/lib/accountsservice/FrugalBuild b/source/lib/accountsservice/FrugalBuild index de1e718..95073e2 100644 --- a/source/lib/accountsservice/FrugalBuild +++ b/source/lib/accountsservice/FrugalBuild @@ -2,23 +2,19 @@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=accountsservice -pkgver=0.6.5 +pkgver=0.6.6 pkgrel=1 pkgdesc="D-Bus interfaces for querying and manipulating user account information" url=http://www.fedoraproject.org/wiki/Features/UserAccountDialog depends=('polkit' 'consolekit') -makedepends=('gtk+2' 'intltool' 'gobject-introspection' 'docbook-xsl') +makedepends=('intltool' 'gobject-introspection' 'docbook-xsl') options=('scriptlet') groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://www.freedesktop.org/software/accountsservice/"; -source=(http://www.freedesktop.org/software/accountsservice/$pkgname-$pkgver.tar.bz2 rc.accounts-daemon) -sha1sums=('91f893b341d9250f8cbb3ab894ec6fcf88d423ed' \ - '032daff28fd895dc7347b4ca4905ee527a162bc4') - -build() { - Fbuild --with-systemdsystemunitdir=/lib/systemd/system - Frcd2 accounts-daemon -} +source=(http://www.freedesktop.org/software/accountsservice/$pkgname-$pkgver.tar.bz2 useradd.diff) +sha1sums=('925b14d57dd3cdd70da300cf030dea3c5c875fdb' \ + 'ec97d530f21a53c712aff5567f851b8111161a9d') +Fconfopts="$Fconfopts --with-systemdsystemunitdir=/lib/systemd/system" # optimization OK diff --git a/source/lib/accountsservice/accountsservice.install b/source/lib/accountsservice/accountsservice.install index 79971f3..8038f9e 100644 --- a/source/lib/accountsservice/accountsservice.install +++ b/source/lib/accountsservice/accountsservice.install @@ -1,6 +1,5 @@ post_install() { - chkconfig --add rc.accounts-daemon systemctl daemon-reload >/dev/null 2>&1 systemctl enable accounts-daemon.service >/dev/null 2>&1 } @@ -16,7 +15,6 @@ pre_remove() { systemctl stop accounts-daemon.service >/dev/null 2>&1 systemctl disable accounts-daemon.service >/dev/null 2>&1 - chkconfig --del rc.accounts-daemon } post_remove() diff --git a/source/lib/accountsservice/rc.accounts-daemon b/source/lib/accountsservice/rc.accounts-daemon deleted file mode 100644 index 42f7a3b..0000000 --- a/source/lib/accountsservice/rc.accounts-daemon +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# (c) 2011 bouleetbil <bouleet...@frogdev.info> -# rc.accounts-daemon for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 97 03 -# description: Accounts Service - -source /lib/initscripts/functions -TEXTDOMAIN=accounts-daemon -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) -daemon=$"accounts-daemon" - -pid="pidof /usr/libexec/accounts-daemon 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/libexec/accounts-daemon >/dev/null 2>&1 & - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - kill $(eval $pid) 2>/dev/null 1>/dev/null - ok $? - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/lib/accountsservice/useradd.diff b/source/lib/accountsservice/useradd.diff new file mode 100644 index 0000000..f7609ff --- /dev/null +++ b/source/lib/accountsservice/useradd.diff @@ -0,0 +1,13 @@ +--- accountsservice-0.6.6/src/daemon.c.old 2011-03-17 20:56:31.000000000 +0100 ++++ accountsservice-0.6.6/src/daemon.c 2011-03-18 21:52:55.000000000 +0100 +@@ -1111,8 +1111,8 @@ + argv[7] = NULL; + } + else if (cd->account_type == ACCOUNT_TYPE_STANDARD) { +- argv[6] = cd->user_name; +- argv[7] = NULL; ++ argv[4] = cd->user_name; ++ argv[5] = NULL; + } + else { + throw_error (context, ERROR_FAILED, "Don't know how to add user of type %d", cd->account_type); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
