[arch-commits] Commit in avahi/trunk (PKGBUILD rc.d.patch)

[Gaetan Bisson]

    Date: Monday, May 13, 2013 @ 12:00:54
  Author: bisson
Revision: 185317

remove deprecated rc script

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/rc.d.patch

------------+
 PKGBUILD   |   15 ++++++++-------
 rc.d.patch |   11 -----------
 2 files changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 09:39:29 UTC (rev 185316)
+++ PKGBUILD	2013-05-13 10:00:54 UTC (rev 185317)
@@ -29,22 +29,22 @@
         'etc/avahi/services/sftp-ssh.service'
         'usr/lib/avahi/service-types.db'
         'usr/share/avahi/service-types')
-source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
-        'rc.d.patch')
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
-          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz")
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
 
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/netdev/network/g' -i avahi-daemon/avahi-dbus.conf
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i ../rc.d.patch
-
 	export MOC_QT3=/usr/bin/moc-qt3
 	export MOC_QT4=/usr/bin/moc-qt4
 
@@ -72,6 +72,7 @@
 	make DESTDIR="${pkgdir}" install
 
 	cd "${pkgdir}"
+	rm -fr /etc/rc.d
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
 	sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
 

Deleted: rc.d.patch
===================================================================
--- rc.d.patch	2013-05-13 09:39:29 UTC (rev 185316)
+++ rc.d.patch	2013-05-13 10:00:54 UTC (rev 185317)
@@ -1,11 +0,0 @@
-diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
---- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
-+++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
-@@ -33,6 +33,7 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then