diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-28 11:13:32 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-28 11:13:32 +0200 |
| commit | 0cc6a0720f9505aaacfc247fa646d3e888f8e4aa (patch) | |
| tree | 65312a00db8134471b6b4d8f32c36cf479effdbe /community/fcron/PKGBUILD | |
| parent | 0c5c6934b681707ec1a459da4318aabd7f9b796f (diff) | |
| parent | 559da5e6e5aff9ccc57e29b6a91c35a528424b6c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/widelands/PKGBUILD
community/bird/PKGBUILD
community/hwinfo/PKGBUILD
community/pdnsd/PKGBUILD
community/spectrwm/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/wireless_tools/PKGBUILD
extra/proftpd/PKGBUILD
libre/grub/PKGBUILD
multilib-testing/lib32-libdrm/PKGBUILD
multilib-testing/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-gdk-pixbuf2/PKGBUILD
testing/pkg-config/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'community/fcron/PKGBUILD')
| -rwxr-xr-x | community/fcron/PKGBUILD | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 7cee8e79d..0e6d688ad 100755 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72788 2012-06-22 12:50:42Z dreisner $ +# $Id: PKGBUILD 75445 2012-08-24 05:27:15Z ttopper $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -6,7 +6,7 @@ pkgname=fcron pkgver=3.0.6 -pkgrel=7 +pkgrel=8 pkgdesc="feature-rich cron implementation" arch=(i686 x86_64 'mips64el') url="http://fcron.free.fr" @@ -75,6 +75,12 @@ package() { # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir/var/run" + + # avoid conflict with libbsd - #31259 + rm "$pkgdir/usr/share/man/man3/bitstring.3" \ + "$pkgdir/usr/share/man/fr/man3/bitstring.3" + rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \ + "$pkgdir/usr/share/man/fr/man3" || true } # vim:set ts=2 sw=2 et: |