[arch-commits] Commit in (7 files)
Andrea Scarpino
andrea at archlinux.org
Sun Jan 11 15:02:25 UTC 2009
Date: Sunday, January 11, 2009 @ 10:02:25
Author: andrea
Revision: 23660
Added:
system-config-printer-gnome/
system-config-printer-gnome/repos/
system-config-printer-gnome/trunk/
system-config-printer-gnome/trunk/PKGBUILD
Modified:
autofs/trunk/PKGBUILD
autofs/trunk/auto.master
autofs/trunk/auto.misc
--------------------------------------------+
autofs/trunk/PKGBUILD | 63 +++++++++++++--------------
autofs/trunk/auto.master | 3 -
autofs/trunk/auto.misc | 8 +--
system-config-printer-gnome/trunk/PKGBUILD | 30 ++++++++++++
4 files changed, 65 insertions(+), 39 deletions(-)
Modified: autofs/trunk/PKGBUILD
===================================================================
--- autofs/trunk/PKGBUILD 2009-01-11 14:57:10 UTC (rev 23659)
+++ autofs/trunk/PKGBUILD 2009-01-11 15:02:25 UTC (rev 23660)
@@ -1,49 +1,48 @@
# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=autofs
-pkgver=4.1.4
-pkgrel=4
+pkgver=5.0.4
+pkgrel=1
pkgdesc="A kernel-based automounter for Linux."
-arch=(i686 x86_64)
-url="ftp://ftp.kernel.org/pub/linux/daemons/autofs"
+arch=('i686' 'x86_64')
+url="http://wiki.autofs.net/FrontPage"
license=('GPL2')
-depends=('libldap')
+depends=('libldap' 'libxml2' 'heimdal')
backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs)
-source=($url/v4/${pkgname}-${pkgver}.tar.bz2
- ${pkgname}
- ${pkgname}.conf.d
- auto.master
- auto.misc
- auto.net)
-md5sums=('7e3949114c00665b4636f0c318179657' '80b77182aa957646a2074433d3890518'\
- 'ddd69346754419faee15fc4c7edeb8b8' '0543a0d172eaec300e8d08708440dd4b'\
- '0be409ef0cdf0255ce701ed4ba9e46b5' 'e4d945d63abc0488a47a5e2a750e8c3b')
+source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
+ 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' 'auto.net' 'heimdal.patch')
+md5sums=('2646dde61edd08dd952255558c733c08'
+ '80b77182aa957646a2074433d3890518'
+ '66035ad00c11ad0dea8673d23cf8b062'
+ '036bb5731400b7b0a89797e949169734'
+ 'd8a15ec9186c5c0b36e5cea1e2739e8a'
+ 'e4d945d63abc0488a47a5e2a750e8c3b'
+ '3a04364a77964b4325a85c2ac2ce2046')
build() {
export MAKEFLAGS="-j1"
- cd ${startdir}/src/${pkgname}-${pkgver}
- /bin/sed -i "s:-O3 -fomit-frame-pointer -Wall:${CFLAGS}:" \
- Makefile.rules
- /bin/sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
- Makefile.rules
- ./configure --prefix=/usr --sysconfdir=/etc/autofs
- /usr/bin/make || return 1
- /usr/bin/make INSTALLROOT=${startdir}/pkg install
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" Makefile.rules
+ patch -Np1 -i ${srcdir}/heimdal.patch
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc/autofs \
+ --without-hesiod
+ make || return 1
+ make INSTALLROOT=${pkgdir} install
local conf_file
for conf_file in auto.{master,misc}; do
- /bin/install -D -m 644 ${startdir}/$conf_file \
- ${startdir}/pkg/etc/autofs/$conf_file
+ install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file
done
- /bin/install -m 755 ${startdir}/auto.net \
- ${startdir}/pkg/etc/autofs/auto.net
- /bin/sed -i "s:/etc:/etc/autofs:g" \
- ${startdir}/pkg/usr/man/man5/auto.master.5
- /bin/install -D -m 755 ${startdir}/autofs ${startdir}/pkg/etc/rc.d/autofs
- /bin/install -D -m 644 ${startdir}/autofs.conf.d \
- ${startdir}/pkg/etc/conf.d/autofs
+ install -m 755 ${srcdir}/auto.net ${pkgdir}/etc/autofs/auto.net
+ sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/man/man5/auto.master.5
+ install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs
+ install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs
}
# vim: ts=2 sw=2 et ft=sh
Modified: autofs/trunk/auto.master
===================================================================
--- autofs/trunk/auto.master 2009-01-11 14:57:10 UTC (rev 23659)
+++ autofs/trunk/auto.master 2009-01-11 15:02:25 UTC (rev 23660)
@@ -3,5 +3,4 @@
# mountpoint map options
# For details of the format look at autofs(5).
-/var/autofs/misc /etc/autofs/auto.misc
-/var/autofs/net /etc/autofs/auto.net
+/media /etc/autofs/auto.media
\ No newline at end of file
Modified: autofs/trunk/auto.misc
===================================================================
--- autofs/trunk/auto.misc 2009-01-11 14:57:10 UTC (rev 23659)
+++ autofs/trunk/auto.misc 2009-01-11 15:02:25 UTC (rev 23660)
@@ -2,8 +2,6 @@
# key [ -mount-options-separated-by-comma ] location
# Details may be found in the autofs(5) manpage
-kernel -ro ftp.kernel.org:/pub/linux
-boot -fstype=ext2 :/dev/hda1
-removable -fstype=ext2 :/dev/hdd
-cd -fstype=iso9660,ro :/dev/hdc
-floppy -fstype=auto :/dev/fd0
+cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom
+floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl
+usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
Added: system-config-printer-gnome/trunk/PKGBUILD
===================================================================
--- system-config-printer-gnome/trunk/PKGBUILD (rev 0)
+++ system-config-printer-gnome/trunk/PKGBUILD 2009-01-11 15:02:25 UTC (rev 23660)
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD,v 1.20 2008/12/29 15:30:49 BaSh Exp $
+# Maintainer: Andrea Scarpino <bash.lnx at gmail.com>
+
+pkgname=system-config-printer-gnome
+pkgver=1.1.1
+pkgrel=1
+pkgdesc="Pygtk CUPS Configuration"
+url="http://cyberelk.net/tim/software/system-config-printer/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('system-config-printer' 'python-notify' 'gnome-python')
+makedepends=('xmlto' 'docbook-xsl' 'perlxml' 'desktop-file-utils')
+source=(http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-$pkgver.tar.bz2)
+md5sums=('95ad721f3d274557144ddcf5e458a9e4')
+
+build() {
+ cd "$srcdir/system-config-printer-$pkgver"
+
+ sed -i 's/at_console="true"/group="sys"/' newprinternotification.conf || return 1
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc
+ make || return 1
+ make DESTDIR="$pkgdir" install
+
+ # remove system-config-printer conflicts
+ rm -rf ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers || return 1
+ rm -r ${pkgdir}/usr/share/system-config-printer/{config,debug,smburi}.py || return 1
+}
More information about the arch-commits
mailing list