Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/packagekit/PKGBUILD
	community/bird/PKGBUILD
	community/camlp5/PKGBUILD
	community/exim/PKGBUILD
	community/ibus-table-extraphrase/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/torcs/PKGBUILD
	core/db/PKGBUILD
	core/iproute2/PKGBUILD
	core/libsasl/PKGBUILD
	core/openldap/PKGBUILD
	core/pam/PKGBUILD
	core/util-linux/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/php/PKGBUILD
	extra/postfix/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/redland/PKGBUILD
	extra/subversion/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/transmission/PKGBUILD
	extra/windowmaker/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-openssl/PKGBUILD

1 files changed, 12 insertions, 13 deletions

diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 788d6800c..df4af9e0d 100755
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61936 2012-01-11 09:30:32Z ttopper $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
-# Contributor: Thomas Bächler
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
+# Contributor: Thomas Bächler
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=fcron
 pkgver=3.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="feature-rich cron implementation"
 arch=(i686 x86_64 'mips64el')
 url="http://fcron.free.fr"
 license=('GPL')
-depends=('sh')
+depends=('pam')
 makedepends=('smtp-server')
 optdepends=('smtp-server: to receive mails from cron jobs')
 provides=('cron')
 conflicts=('dcron')
 backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
         var/spool/fcron/systab var/spool/fcron/systab.orig)
-install=fcron.install
 options=('emptydirs' '!makeflags')
 source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
         systab systab.orig run-cron)
@@ -34,8 +33,8 @@ build() {
               --sysconfdir=/etc/fcron \
               --with-answer-all=no \
               --with-boot-install=no \
-              --with-username=cron \
-              --with-groupname=cron \
+              --with-username=root \
+              --with-groupname=root \
               --datarootdir=/usr/share \
 	            --datadir=/usr/share \
               --with-docdir=/usr/share/doc \
@@ -46,26 +45,26 @@ build() {
 }
 
 package() {
-  # Create necessary user and group
-  getent group cron || /usr/sbin/groupadd -g 22 cron
-  getent passwd cron || /usr/sbin/useradd -d / -g cron -u 22 -s /bin/false cron
-
   cd "$srcdir/$pkgname-$pkgver"
-  mkdir -p "$pkgdir/var/spool"
+  
   make DESTDIR="$pkgdir/" install
   install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
+  
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
   # Install default fcrontab so that fcron can completely replace dcron
+  
   install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
   # In order to preserve the systab crontab in any case it is better to have
   # it in non-binary form too
   install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
+
   # Add cron.* directories
   install -d -m755 "$pkgdir/etc/cron.daily"
   install -d -m755 "$pkgdir/etc/cron.hourly"
   install -d -m755 "$pkgdir/etc/cron.monthly"
   install -d -m755 "$pkgdir/etc/cron.weekly"
+  
   # Install run-cron script to make fcron run without dcron
   install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
 }