Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

5 files changed, 29 insertions, 39 deletions

diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 271b52fe7..cf512694c 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $
+# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
@@ -7,31 +7,26 @@
 
 pkgname=fcron
 pkgver=3.1.2
-pkgrel=5
+pkgrel=7
 pkgdesc='Feature-rich cron implementation'
 arch=(i686 x86_64 mips64el)
 url='http://fcron.free.fr'
 license=('GPL')
-depends=('pam')
-makedepends=('smtp-server' 'vi')
-optdepends=('smtp-server: to receive mails from cron jobs'
+depends=('pam' 'run-parts')
+makedepends=('smtp-forwarder' 'vi')
+optdepends=('smtp-forwarder: to send mails from cron jobs'
             'vi: default editor for fcrontab')
 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')
+        'etc/fcron/fcron.deny')
 options=('emptydirs' '!makeflags')
+install=$pkgname.install
 source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
-        'systab'
-        'systab.orig'
-        'run-cron')
+        'systab.orig')
 md5sums=('36bf213e15f3a480f2274f8e46cced0a'
-         '55be3e80fb2545608feae6f2e0eebece'
-         '5384c607d842ca3d5cbb612ac1dceb15'
-         '524eba827447a6b7ef7515eedf305698')
+         'afecbfd98caa49e8e4aa239fa1b19255')
 
 build() {
   cd $pkgname-$pkgver
@@ -60,11 +55,10 @@ package() {
   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 -m640 "$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 a default fcrontab so that fcron can completely replace dcron
+  # We doesn't use binary format which is incompatible between arch and may cause crash
+  # We regenerate the binary format at each update
   install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
 
   # Add cron.* directories
@@ -73,9 +67,6 @@ package() {
   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/bin/run-cron"
-
   # avoid conflict with filesystem>=2012.06
   rmdir "$pkgdir"/{var/,}run
 
diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install
new file mode 100644
index 000000000..f7b0abddf
--- /dev/null
+++ b/community/fcron/fcron.install
@@ -0,0 +1,13 @@
+# arg 1:  the new package version
+post_install() {
+  # Generate binary format which is incompatible between arch
+  fcrontab -z -u systab &>/dev/null
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fcron/run-cron b/community/fcron/run-cron
deleted file mode 100644
index 8e65e2fd0..000000000
--- a/community/fcron/run-cron
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-
-if [[ -z "$1" ]]; then
-   echo "Usage: $0 crondir"
-   exit 1
-fi
-
-for cron in "$1"/* ; do
-  if [[ -x "$cron" ]]; then
-     "$cron"
-  fi
-done
-unset cron
diff --git a/community/fcron/systab b/community/fcron/systab
deleted file mode 100644
index 7947f3598..000000000
--- a/community/fcron/systab
+++ /dev/null
diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig
index b57ba8ef2..00af327bc 100644
--- a/community/fcron/systab.orig
+++ b/community/fcron/systab.orig
@@ -1,4 +1,4 @@
-&bootrun 01 * * * *  /usr/bin/run-cron /etc/cron.hourly
-&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily
-&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly
-&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly
+&bootrun 01 * * * *  /usr/bin/run-parts /etc/cron.hourly
+&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily
+&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly
+&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly