[arch-commits] Commit in avahi/trunk (PKGBUILD)

2020-11-10 Thread Evangelos Foutras via arch-commits
Date: Wednesday, November 11, 2020 @ 06:55:25
  Author: foutrelis
Revision: 400239

upgpkg: avahi 0.8+15+ge8a3dd0-3: Python 3.9 rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 06:55:00 UTC (rev 400238)
+++ PKGBUILD2020-11-11 06:55:25 UTC (rev 400239)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.8+15+ge8a3dd0
-pkgrel=2
+pkgrel=3
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2020-11-09 Thread Felix Yan via arch-commits
Date: Monday, November 9, 2020 @ 14:11:13
  Author: felixonmars
Revision: 399730

upgpkg: avahi 0.8+15+ge8a3dd0-2: Python 3.9 rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-09 14:09:30 UTC (rev 399729)
+++ PKGBUILD2020-11-09 14:11:13 UTC (rev 399730)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.8+15+ge8a3dd0
-pkgrel=1
+pkgrel=2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2020-03-12 Thread Jan Steffens via arch-commits
Date: Friday, March 13, 2020 @ 00:19:35
  Author: heftig
Revision: 377463

0.8+15+ge8a3dd0-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-13 00:16:48 UTC (rev 377462)
+++ PKGBUILD2020-03-13 00:19:35 UTC (rev 377463)
@@ -3,7 +3,7 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.8+6+g751be80
+pkgver=0.8+15+ge8a3dd0
 pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
@@ -10,13 +10,12 @@
 license=(LGPL)
 arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git pygtk gobject-introspection gtk3 qt5-base xmltoman python-dbus
+makedepends=(git gobject-introspection gtk3 qt5-base xmltoman python-dbus
  python-gobject doxygen graphviz libevent)
 optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, 
bvnc'
 'qt5-base: qt5 bindings'
 'libevent: libevent bindings'
 'nss-mdns: NSS support for mDNS'
-'pygtk: avahi-bookmarks'
 'python-twisted: avahi-bookmarks'
 'python-gobject: avahi-bookmarks, avahi-discover'
 'python-dbus: avahi-bookmarks, avahi-discover')
@@ -25,7 +24,7 @@
   libavahi-qt5.so libavahi-ui-gtk3.so libdns_sd.so)
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
 usr/lib/avahi/service-types.db)
-_commit=751be804e891aec5701a059144e2f5cbfc981b36  # master
+_commit=e8a3dd0d480a754318e312e6fa66fea249808187  # master
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;)
 sha512sums=('SKIP')
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2020-02-18 Thread Jan Steffens via arch-commits
Date: Tuesday, February 18, 2020 @ 13:46:11
  Author: heftig
Revision: 375788

0.8+6+g751be80-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   42 --
 1 file changed, 16 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-18 13:11:27 UTC (rev 375787)
+++ PKGBUILD2020-02-18 13:46:11 UTC (rev 375788)
@@ -3,27 +3,29 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.7+18+g1b5f401
-pkgrel=3
+pkgver=0.8+6+g751be80
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
 arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3 
qt5-base
- xmltoman python-dbus python-gobject doxygen graphviz)
+makedepends=(git pygtk gobject-introspection gtk3 qt5-base xmltoman python-dbus
+ python-gobject doxygen graphviz libevent)
 optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, 
bvnc'
-'gtk2: gtk2 bindings'
 'qt5-base: qt5 bindings'
+'libevent: libevent bindings'
+'nss-mdns: NSS support for mDNS'
 'pygtk: avahi-bookmarks'
-'python2-twisted: avahi-bookmarks'
-'mono: mono bindings'
-'nss-mdns: NSS support for mDNS'
-'python-gobject: avahi-discover'
-'python-dbus: avahi-discover')
+'python-twisted: avahi-bookmarks'
+'python-gobject: avahi-bookmarks, avahi-discover'
+'python-dbus: avahi-bookmarks, avahi-discover')
+provides=(libavahi-client.so libavahi-common.so libavahi-core.so
+  libavahi-glib.so libavahi-gobject.so libavahi-libevent.so
+  libavahi-qt5.so libavahi-ui-gtk3.so libdns_sd.so)
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
 usr/lib/avahi/service-types.db)
-_commit=1b5f401f64d7bed40c4335b0327acf4125da3086  # pull/115/merge~2
+_commit=751be804e891aec5701a059144e2f5cbfc981b36  # master
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;)
 sha512sums=('SKIP')
 
@@ -34,16 +36,11 @@
 
 prepare() {
   cd $pkgname
-
-  # CVE-2017-6519 CVE-2018-100084
-  git cherry-pick -n e111def44a7df4624a4aa3f85fe98054bffb6b4f
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
-  export PYTHON=/usr/bin/python3
 
   ./configure \
 --prefix=/usr \
@@ -51,8 +48,7 @@
 --localstatedir=/var \
 --sbindir=/usr/bin \
 with_dbus_sys=/usr/share/dbus-1/system.d \
---disable-monodoc \
---disable-qt4 \
+--disable-mono \
 --enable-compat-libdns_sd \
 --with-distro=archlinux \
 --with-avahi-priv-access-group=network \
@@ -61,23 +57,17 @@
 --with-systemdsystemunitdir=/usr/lib/systemd/system
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-  cp -a avahi-python/avahi avahi-python/avahi2
-
   make
-  make -C avahi-python/avahi2 PYTHON=/usr/bin/python2
 }
 
 package() {
+  depends+=(libdbus-1.so)
+
   cd $pkgname
   make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C avahi-python/avahi2 install \
-PYTHON=/usr/bin/python2 pythondir=/usr/lib/python2.7/site-packages
 
   rmdir "$pkgdir/run"
 
-  # this isn't ported
-  sed -i '1s|python3|python2|' "$pkgdir/usr/bin/avahi-bookmarks"
-
   # mdnsresponder compat
   ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2019-10-27 Thread Felix Yan via arch-commits
Date: Sunday, October 27, 2019 @ 07:12:44
  Author: felixonmars
Revision: 365926

Python 3.8 rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-27 07:11:25 UTC (rev 365925)
+++ PKGBUILD2019-10-27 07:12:44 UTC (rev 365926)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.7+18+g1b5f401
-pkgrel=2
+pkgrel=3
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2019-04-29 Thread Antonio Rojas via arch-commits
Date: Monday, April 29, 2019 @ 20:30:58
  Author: arojas
Revision: 352247

Disable qt4 support

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-29 18:31:49 UTC (rev 352246)
+++ PKGBUILD2019-04-29 20:30:58 UTC (rev 352247)
@@ -4,17 +4,16 @@
 
 pkgname=avahi
 pkgver=0.7+18+g1b5f401
-pkgrel=1
+pkgrel=2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
 arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git qt4 pygtk mono intltool gtk-sharp-2 gobject-introspection 
gtk3 qt5-base
+makedepends=(git pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3 
qt5-base
  xmltoman python-dbus python-gobject doxygen graphviz)
 optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, 
bvnc'
 'gtk2: gtk2 bindings'
-'qt4: qt4 bindings'
 'qt5-base: qt5 bindings'
 'pygtk: avahi-bookmarks'
 'python2-twisted: avahi-bookmarks'
@@ -44,7 +43,7 @@
 
 build() {
   cd $pkgname
-  export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python3
+  export PYTHON=/usr/bin/python3
 
   ./configure \
 --prefix=/usr \
@@ -53,6 +52,7 @@
 --sbindir=/usr/bin \
 with_dbus_sys=/usr/share/dbus-1/system.d \
 --disable-monodoc \
+--disable-qt4 \
 --enable-compat-libdns_sd \
 --with-distro=archlinux \
 --with-avahi-priv-access-group=network \


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2019-01-15 Thread Jan Steffens via arch-commits
Date: Tuesday, January 15, 2019 @ 20:31:50
  Author: heftig
Revision: 344174

0.7+18+g1b5f401-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 20:31:03 UTC (rev 344173)
+++ PKGBUILD2019-01-15 20:31:50 UTC (rev 344174)
@@ -3,8 +3,8 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.7+16+g1cc2b8e
-pkgrel=2
+pkgver=0.7+18+g1b5f401
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -24,7 +24,7 @@
 'python-dbus: avahi-discover')
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
 usr/lib/avahi/service-types.db)
-_commit=1cc2b8e8d62e939b8bd683f795794878863931af  # master
+_commit=1b5f401f64d7bed40c4335b0327acf4125da3086  # pull/115/merge~2
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;)
 sha512sums=('SKIP')
 
@@ -35,6 +35,10 @@
 
 prepare() {
   cd $pkgname
+
+  # CVE-2017-6519 CVE-2018-100084
+  git cherry-pick -n e111def44a7df4624a4aa3f85fe98054bffb6b4f
+
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -47,6 +51,7 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --sbindir=/usr/bin \
+with_dbus_sys=/usr/share/dbus-1/system.d \
 --disable-monodoc \
 --enable-compat-libdns_sd \
 --with-distro=archlinux \


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2018-07-18 Thread Felix Yan via arch-commits
Date: Wednesday, July 18, 2018 @ 06:18:18
  Author: felixonmars
Revision: 328945

Python 3.7 rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-18 06:16:08 UTC (rev 328944)
+++ PKGBUILD2018-07-18 06:18:18 UTC (rev 328945)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.7+16+g1cc2b8e
-pkgrel=1
+pkgrel=2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2018-07-18 Thread Evangelos Foutras via arch-commits
Date: Wednesday, July 18, 2018 @ 06:16:08
  Author: foutrelis
Revision: 328944

Disable seemingly unneeded patch for GDBM 1.15

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-18 03:19:59 UTC (rev 328943)
+++ PKGBUILD2018-07-18 06:16:08 UTC (rev 328944)
@@ -38,7 +38,14 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../0001-build-Attempt-GDBM-1.15-compatibility.patch
+  # This patch seems to cause the build to fail:
+  # GEN  service-types.db
+  # GEN  service-types.db.pag
+  # GEN  service-types.db.dir
+  #   mv: cannot stat 'service-types.db.coming.pag': No such file or directory
+  #   mv: cannot stat 'service-types.db.coming.dir': No such file or directory
+  #   make[2]: *** [Makefile:668: service-types.db.pag] Error 1
+  #patch -Np1 -i ../0001-build-Attempt-GDBM-1.15-compatibility.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2018-04-06 Thread Jan Steffens via arch-commits
Date: Friday, April 6, 2018 @ 23:15:46
  Author: heftig
Revision: 321280

0.7+4+gd8d8c67-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-06 22:46:54 UTC (rev 321279)
+++ PKGBUILD2018-04-06 23:15:46 UTC (rev 321280)
@@ -4,8 +4,8 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.7
-pkgrel=4
+pkgver=0.7+4+gd8d8c67
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -22,9 +22,9 @@
 'nss-mdns: NSS support for mDNS'
 'python-gobject: avahi-discover'
 'python-dbus: avahi-discover')
-backup=(etc/avahi/{hosts,avahi-daemon.conf}
+backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
 usr/lib/avahi/service-types.db)
-_commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
+_commit=d8d8c67d8279f35eef157f5f442a1dde4ac5c45e  # master
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
 sha512sums=('SKIP'


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2018-01-08 Thread Jan Steffens via arch-commits
Date: Tuesday, January 9, 2018 @ 01:49:07
  Author: heftig
Revision: 314271

0.7-4: FS#56989 Restore services dir

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-08 20:25:53 UTC (rev 314270)
+++ PKGBUILD2018-01-09 01:49:07 UTC (rev 314271)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.7
-pkgrel=3
+pkgrel=4
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -24,7 +24,6 @@
 'python-dbus: avahi-discover')
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db)
-options=(!emptydirs)
 _commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
@@ -73,6 +72,8 @@
   make DESTDIR="$pkgdir" -C avahi-python/avahi2 install \
 PYTHON=/usr/bin/python2 pythondir=/usr/lib/python2.7/site-packages
 
+  rmdir "$pkgdir/run"
+
   # this isn't ported
   sed -i '1s|python3|python2|' "$pkgdir/usr/bin/avahi-bookmarks"
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2018-01-04 Thread Felix Yan via arch-commits
Date: Friday, January 5, 2018 @ 04:41:47
  Author: felixonmars
Revision: 314070

upgpkg: avahi 0.7-3

rebuild with gdbm 1.14.1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-05 02:57:26 UTC (rev 314069)
+++ PKGBUILD2018-01-05 04:41:47 UTC (rev 314070)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -28,8 +28,8 @@
 _commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
-sha256sums=('SKIP'
-'5e2347d73349cee56c17ef53b69418d0b083e2fe26d19af61ef2ba55ef43cf16')
+sha512sums=('SKIP'
+
'8cfc7c2cb0061e6348caa96b73bb6069efce5b4438962aa12448e46bc950a47c1f18059afbb1cacf7b2a1aa21f77025472532ad5e6eddb17834a8b1a34432226')
 
 pkgver() {
   cd $pkgname


[arch-commits] Commit in avahi/trunk (PKGBUILD avahi.install)

2017-12-15 Thread Jan Steffens via arch-commits
Date: Saturday, December 16, 2017 @ 02:19:45
  Author: heftig
Revision: 312951

0.7-2

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/avahi.install

---+
 PKGBUILD  |9 +
 avahi.install |   16 
 2 files changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-16 00:36:03 UTC (rev 312950)
+++ PKGBUILD2017-12-16 02:19:45 UTC (rev 312951)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -12,7 +12,7 @@
 arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
 makedepends=(git qt4 pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3
- xmltoman python-dbus python-gobject)
+ xmltoman python-dbus python-gobject doxygen graphviz)
 optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, 
bvnc'
 'gtk2: gtk2 bindings'
 'qt4: qt4 bindings'
@@ -22,9 +22,9 @@
 'nss-mdns: NSS support for mDNS'
 'python-gobject: avahi-discover'
 'python-dbus: avahi-discover')
-install=avahi.install
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db)
+options=(!emptydirs)
 _commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
@@ -84,5 +84,6 @@
   mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \
 "$pkgdir/usr/share/doc/$pkgname/"
 
-  rmdir "$pkgdir"/run
+  echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' |
+install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 }

Deleted: avahi.install
===
--- avahi.install   2017-12-16 00:36:03 UTC (rev 312950)
+++ avahi.install   2017-12-16 02:19:45 UTC (rev 312951)
@@ -1,16 +0,0 @@
-post_install() {
-  if ! getent passwd avahi &>/dev/null; then
-groupadd -r -g 84 avahi
-useradd -r -u 84 -g avahi -d / -s /bin/nologin -c avahi avahi
-  fi
-}
-
-post_upgrade() {
-  if (( $(vercmp $2 0.6.32rc-1) < 0 )); then
-cat <>> Avahi now needs to be enabled in order to launch.
-Run \`systemctl enable avahi-daemon\` if you wish
-to make use of Avahi.
-MSG
-  fi
-}


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2017-07-11 Thread Jan Steffens
Date: Tuesday, July 11, 2017 @ 20:48:03
  Author: heftig
Revision: 300128

Remove removed backup file

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 20:47:11 UTC (rev 300127)
+++ PKGBUILD2017-07-11 20:48:03 UTC (rev 300128)
@@ -24,7 +24,7 @@
 'python-dbus: avahi-discover')
 install=avahi.install
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
-usr/lib/avahi/service-types.db usr/share/avahi/service-types)
+usr/lib/avahi/service-types.db)
 _commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
 source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2017-07-11 Thread Jan Steffens
Date: Tuesday, July 11, 2017 @ 20:44:02
  Author: heftig
Revision: 300125

reduce overlinking

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 20:43:48 UTC (rev 300124)
+++ PKGBUILD2017-07-11 20:44:02 UTC (rev 300125)
@@ -59,6 +59,7 @@
 --with-autoipd-user=avahi \
 --with-autoipd-group=avahi \
 --with-systemdsystemunitdir=/usr/lib/systemd/system
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
   cp -a avahi-python/avahi avahi-python/avahi2
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2017-07-11 Thread Jan Steffens
Date: Tuesday, July 11, 2017 @ 20:40:22
  Author: heftig
Revision: 300123

0.7-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 20:35:15 UTC (rev 300122)
+++ PKGBUILD2017-07-11 20:40:22 UTC (rev 300123)
@@ -4,9 +4,8 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.6.32
-pkgrel=3
-_commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
+pkgver=0.7
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -26,11 +25,16 @@
 install=avahi.install
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db usr/share/avahi/service-types)
-source=("git+$url#commit=$_commit"
+_commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
+source=("git+https://github.com/lathiat/avahi#commit=$_commit;
 0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
 sha256sums=('SKIP'
 '5e2347d73349cee56c17ef53b69418d0b083e2fe26d19af61ef2ba55ef43cf16')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
   cd $pkgname


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2016-12-24 Thread Evangelos Foutras
Date: Saturday, December 24, 2016 @ 17:48:09
  Author: foutrelis
Revision: 284667

Python 3.6 rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 17:43:21 UTC (rev 284666)
+++ PKGBUILD2016-12-24 17:48:09 UTC (rev 284667)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.6.32
-pkgrel=2
+pkgrel=3
 _commit=4f334990f692ce08ab4ea2eece695f1592f535b2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
@@ -62,7 +62,7 @@
   cd $pkgname
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
-PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.5/site-packages
+PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.6/site-packages
 
   # mdnsresponder compat
   ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2016-03-06 Thread Jan Steffens
Date: Sunday, March 6, 2016 @ 14:03:06
  Author: heftig
Revision: 261105

Remove howl compat

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-06 11:06:03 UTC (rev 261104)
+++ PKGBUILD2016-03-06 13:03:06 UTC (rev 261105)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.6.32
-pkgrel=1
+pkgrel=2
 _commit=4f334990f692ce08ab4ea2eece695f1592f535b2
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
 url='https://github.com/lathiat/avahi'
@@ -22,12 +22,10 @@
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-conflicts=(howl mdnsresponder)
-provides=(howl mdnsresponder)
 install=avahi.install
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db usr/share/avahi/service-types)
-source=("git+$url#tag=$_commit")
+source=("git+$url#commit=$_commit")
 sha256sums=('SKIP')
 
 
@@ -48,7 +46,6 @@
 --disable-monodoc \
 --disable-qt3 \
 --enable-compat-libdns_sd \
---enable-compat-howl \
 --with-distro=archlinux \
 --with-avahi-priv-access-group=network \
 --with-autoipd-user=avahi \
@@ -67,10 +64,6 @@
   make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
 PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.5/site-packages
 
-  # howl compat
-  ln -s avahi-compat-howl "$pkgdir/usr/include/howl"
-  ln -s avahi-compat-howl.pc "$pkgdir/usr/lib/pkgconfig/howl.pc"
-
   # mdnsresponder compat
   ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2016-02-17 Thread Jan Steffens
Date: Wednesday, February 17, 2016 @ 22:05:29
  Author: heftig
Revision: 259929

0.6.32

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 20:59:01 UTC (rev 259928)
+++ PKGBUILD2016-02-17 21:05:29 UTC (rev 259929)
@@ -4,12 +4,11 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.6.32rc
-pkgrel=4
-_commit=dbb07bea8d315b76f94b16e55a1c2b2cc8ddd91f
-pkgdesc='Multicast DNS-SD / Zeroconf Suite'
-#url='http://www.avahi.org/'
-url='http://git.0pointer.net/avahi.git'
+pkgver=0.6.32
+pkgrel=1
+_commit=4f334990f692ce08ab4ea2eece695f1592f535b2
+pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with 
Bonjour'
+url='https://github.com/lathiat/avahi'
 license=(LGPL)
 arch=(i686 x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
@@ -28,7 +27,7 @@
 install=avahi.install
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db usr/share/avahi/service-types)
-source=("git+https://github.com/lathiat/avahi#commit=$_commit;)
+source=("git+$url#tag=$_commit")
 sha256sums=('SKIP')
 
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2016-01-20 Thread Jan Steffens
Date: Thursday, January 21, 2016 @ 00:53:25
  Author: heftig
Revision: 258457

Move example SSH services

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-20 23:48:14 UTC (rev 258456)
+++ PKGBUILD2016-01-20 23:53:25 UTC (rev 258457)
@@ -5,8 +5,8 @@
 
 pkgname=avahi
 pkgver=0.6.32rc
-pkgrel=3
-_commit=bc4e85846991d0efca89add631c7cd16033f0bef
+pkgrel=4
+_commit=dbb07bea8d315b76f94b16e55a1c2b2cc8ddd91f
 pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'
 url='http://git.0pointer.net/avahi.git'
@@ -26,10 +26,9 @@
 conflicts=(howl mdnsresponder)
 provides=(howl mdnsresponder)
 install=avahi.install
-options=(!emptydirs)
-backup=(etc/avahi/{hosts,avahi-daemon.conf,services/{ssh,sftp-ssh}.service}
+backup=(etc/avahi/{hosts,avahi-daemon.conf}
 usr/lib/avahi/service-types.db usr/share/avahi/service-types)
-source=("git+https://github.com/heftig/avahi#commit=$_commit;)
+source=("git+https://github.com/lathiat/avahi#commit=$_commit;)
 sha256sums=('SKIP')
 
 
@@ -75,4 +74,11 @@
 
   # mdnsresponder compat
   ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"
+
+  # move example services https://bugs.archlinux.org/task/47822
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \
+"$pkgdir/usr/share/doc/$pkgname/"
+
+  rmdir "$pkgdir"/var{/run,}
 }


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras
Date: Sunday, December 6, 2015 @ 13:37:11
  Author: foutrelis
Revision: 252796

C++11 ABI rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 12:35:06 UTC (rev 252795)
+++ PKGBUILD2015-12-06 12:37:11 UTC (rev 252796)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.6.32rc
-pkgrel=2
+pkgrel=3
 _commit=bc4e85846991d0efca89add631c7cd16033f0bef
 pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2015-12-05 Thread Antonio Rojas
Date: Sunday, December 6, 2015 @ 06:45:34
  Author: arojas
Revision: 252605

C++11 ABI rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 05:44:06 UTC (rev 252604)
+++ PKGBUILD2015-12-06 05:45:34 UTC (rev 252605)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.6.32rc
-pkgrel=1
+pkgrel=2
 _commit=bc4e85846991d0efca89add631c7cd16033f0bef
 pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'


[arch-commits] Commit in avahi/trunk (PKGBUILD avahi.install)

2015-10-20 Thread Jan Steffens
Date: Tuesday, October 20, 2015 @ 22:13:01
  Author: heftig
Revision: 249580

0.6.32rc

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/avahi.install

---+
 PKGBUILD  |9 +++--
 avahi.install |   10 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-20 20:01:47 UTC (rev 249579)
+++ PKGBUILD2015-10-20 20:13:01 UTC (rev 249580)
@@ -4,9 +4,9 @@
 # Contributor: Douglas Soares de Andrade 
 
 pkgname=avahi
-pkgver=0.6.31
-pkgrel=17
-_commit=573e3b5
+pkgver=0.6.32rc
+pkgrel=1
+_commit=bc4e85846991d0efca89add631c7cd16033f0bef
 pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'
 url='http://git.0pointer.net/avahi.git'
@@ -75,7 +75,4 @@
 
   # mdnsresponder compat
   ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"
-
-  # see FS#42638
-  ln -s avahi-daemon.service 
"$pkgdir/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service"
 }

Modified: avahi.install
===
--- avahi.install   2015-10-20 20:01:47 UTC (rev 249579)
+++ avahi.install   2015-10-20 20:13:01 UTC (rev 249580)
@@ -4,3 +4,13 @@
 useradd -r -u 84 -g avahi -d / -s /bin/nologin -c avahi avahi
   fi
 }
+
+post_upgrade() {
+  if (( $(vercmp $2 0.6.32rc-1) < 0 )); then
+cat <>> Avahi now needs to be enabled in order to launch.
+Run \`systemctl enable avahi-daemon\` if you wish
+to make use of Avahi.
+MSG
+  fi
+}


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2015-09-19 Thread Jan Steffens
Date: Saturday, September 19, 2015 @ 22:12:23
  Author: heftig
Revision: 246692

py3.5

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-19 20:11:31 UTC (rev 246691)
+++ PKGBUILD2015-09-19 20:12:23 UTC (rev 246692)
@@ -5,7 +5,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=16
+pkgrel=17
 _commit=573e3b5
 pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'
@@ -67,7 +67,7 @@
   cd $pkgname
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
-PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.4/site-packages
+PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.5/site-packages
 
   # howl compat
   ln -s avahi-compat-howl "$pkgdir/usr/include/howl"


[arch-commits] Commit in avahi/trunk (PKGBUILD avahi.install install)

2015-06-30 Thread Jan Steffens
Date: Wednesday, July 1, 2015 @ 06:33:01
  Author: heftig
Revision: 241656

Add patches (mainly from Fedora), fix kDBus, don't remove user on uninstall, 
add py3 lib

Added:
  avahi/trunk/avahi.install
(from rev 241549, avahi/trunk/install)
Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/install

---+
 PKGBUILD  |  106 +++-
 avahi.install |6 +++
 install   |   11 -
 3 files changed, 58 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-01 03:01:11 UTC (rev 241655)
+++ PKGBUILD2015-07-01 04:33:01 UTC (rev 241656)
@@ -1,17 +1,20 @@
 # $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=15
-pkgdesc='Multicast/unicast DNS-SD framework'
+pkgrel=16
+_commit=573e3b5
+pkgdesc='Multicast DNS-SD / Zeroconf Suite'
 #url='http://www.avahi.org/'
 url='http://git.0pointer.net/avahi.git'
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
+license=(LGPL)
+arch=(i686 x86_64)
+depends=(expat libdaemon glib2 libcap gdbm dbus)
+makedepends=(git qt4 pygtk mono intltool python2-dbus gtk-sharp-2 
gobject-introspection gtk3
+ xmltoman python-dbus)
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
 'qt4: qt4 bindings'
@@ -20,64 +23,59 @@
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('git' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
-backup=('etc/avahi/hosts'
-'etc/avahi/avahi-daemon.conf'
-'etc/avahi/services/ssh.service'
-'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;)
-#sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
-source=('git://git.0pointer.net/avahi.git#commit=147cdce70b22ae7cee9fb4fe123db40952f31c9e')
-sha1sums=('SKIP')
+conflicts=(howl mdnsresponder)
+provides=(howl mdnsresponder)
+install=avahi.install
+options=(!emptydirs)
+backup=(etc/avahi/{hosts,avahi-daemon.conf,services/{ssh,sftp-ssh}.service}
+usr/lib/avahi/service-types.db usr/share/avahi/service-types)
+source=(git+https://github.com/heftig/avahi#commit=$_commit;)
+sha256sums=('SKIP')
 
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
 
-install=install
-
 prepare() {
-   cd ${srcdir}/${pkgname} #-${pkgver}
-   sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
-   sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
-   sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-   cd ${srcdir}/${pkgname} #-${pkgver}
-   export MOC_QT4=/usr/bin/moc-qt4
-   export PYTHON=/usr/bin/python2
+  cd $pkgname
+  export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python2
 
-   ./autogen.sh || true
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --localstatedir=/var \
-   --sbindir=/usr/bin \
-   --disable-monodoc \
-   --disable-qt3 \
-   --enable-compat-libdns_sd \
-   --enable-compat-howl \
-   --with-distro=archlinux \
-   --with-avahi-priv-access-group=network \
-   --with-autoipd-user=avahi \
-   --with-autoipd-group=avahi \
-   --with-systemdsystemunitdir=/usr/lib/systemd/system \
+  ./configure \
+--prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var \
+--sbindir=/usr/bin \
+--disable-monodoc \
+--disable-qt3 \
+--enable-compat-libdns_sd \
+--enable-compat-howl \
+--with-distro=archlinux \
+--with-avahi-priv-access-group=network \
+--with-autoipd-user=avahi \
+--with-autoipd-group=avahi \
+--with-systemdsystemunitdir=/usr/lib/systemd/system
 
-   make
+  cp -a avahi-python/avahi avahi-python/avahi3
+
+  make
+  make -C avahi-python/avahi3 PYTHON=/usr/bin/python3
 }
 
 package() {
-   cd ${srcdir}/${pkgname} #-${pkgver}
-   make DESTDIR=${pkgdir} install
-   rm -fr ${pkgdir}/etc/rc.d
+  cd $pkgname
+  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C avahi-python/avahi3 install \
+PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.4/site-packages
 
-   # howl and mdnsresponder compatability
-   cd ${pkgdir}/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h 
dns_sd.h; ln -s 

[arch-commits] Commit in avahi/trunk (PKGBUILD)

2015-03-25 Thread Gaetan Bisson
Date: Thursday, March 26, 2015 @ 01:09:06
  Author: bisson
Revision: 234948

switch to git snapshot, fix FS#44325

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-25 21:11:32 UTC (rev 234947)
+++ PKGBUILD2015-03-26 00:09:06 UTC (rev 234948)
@@ -4,9 +4,10 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=14
+pkgrel=15
 pkgdesc='Multicast/unicast DNS-SD framework'
-url='http://www.avahi.org/'
+#url='http://www.avahi.org/'
+url='http://git.0pointer.net/avahi.git'
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
@@ -19,7 +20,7 @@
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('git' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'
@@ -27,8 +28,10 @@
 '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;)
-sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
+#source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;)
+#sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684')
+source=('git://git.0pointer.net/avahi.git#commit=147cdce70b22ae7cee9fb4fe123db40952f31c9e')
+sha1sums=('SKIP')
 
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
@@ -36,18 +39,18 @@
 install=install
 
 prepare() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname} #-${pkgver}
sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
-   sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
 }
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname} #-${pkgver}
export MOC_QT4=/usr/bin/moc-qt4
export PYTHON=/usr/bin/python2
 
+   ./autogen.sh || true
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -67,7 +70,7 @@
 }
 
 package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/${pkgname} #-${pkgver}
make DESTDIR=${pkgdir} install
rm -fr ${pkgdir}/etc/rc.d
 


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2014-11-10 Thread Gaetan Bisson
Date: Tuesday, November 11, 2014 @ 00:52:17
  Author: bisson
Revision: 226000

fix FS#42638

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-10 23:52:01 UTC (rev 225999)
+++ PKGBUILD2014-11-10 23:52:17 UTC (rev 226000)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=13
+pkgrel=14
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -74,4 +74,7 @@
# howl and mdnsresponder compatability
cd ${pkgdir}/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h 
dns_sd.h; ln -s avahi-compat-howl howl
cd ${pkgdir}/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
+
+   # see FS#42638
+   ln avahi-daemon.service -s 
${pkgdir}/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service
 }


[arch-commits] Commit in avahi/trunk (PKGBUILD)

2014-08-27 Thread Gaetan Bisson
Date: Wednesday, August 27, 2014 @ 19:40:50
  Author: bisson
Revision: 220706

rebuild to fix pyc/pyo mtimes

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-27 16:23:51 UTC (rev 220705)
+++ PKGBUILD2014-08-27 17:40:50 UTC (rev 220706)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=12
+pkgrel=13
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2014-08-02 Thread Gaetan Bisson
Date: Saturday, August 2, 2014 @ 19:46:07
  Author: bisson
Revision: 218518

twisted has been renamed python2-twisted

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-02 14:55:49 UTC (rev 218517)
+++ PKGBUILD2014-08-02 17:46:07 UTC (rev 218518)
@@ -15,7 +15,7 @@
 'gtk2: gtk2 bindings'
 'qt4: qt4 bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
-'twisted: avahi-bookmarks'
+'python2-twisted: avahi-bookmarks'
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2014-05-15 Thread Eric Bélanger
Date: Thursday, May 15, 2014 @ 16:26:13
  Author: eric
Revision: 212819

upgpkg: avahi 0.6.31-12

Remove obsolete qt3 support

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-15 14:09:36 UTC (rev 212818)
+++ PKGBUILD2014-05-15 14:26:13 UTC (rev 212819)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=11
+pkgrel=12
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -13,7 +13,6 @@
 depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
-'qt3: qt3 bindings'
 'qt4: qt4 bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
 'twisted: avahi-bookmarks'
@@ -20,7 +19,7 @@
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'
@@ -46,7 +45,6 @@
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
-   export MOC_QT3=/usr/bin/moc-qt3
export MOC_QT4=/usr/bin/moc-qt4
export PYTHON=/usr/bin/python2
 
@@ -56,6 +54,7 @@
--localstatedir=/var \
--sbindir=/usr/bin \
--disable-monodoc \
+   --disable-qt3 \
--enable-compat-libdns_sd \
--enable-compat-howl \
--with-distro=archlinux \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-10-31 Thread Gaetan Bisson
Date: Thursday, October 31, 2013 @ 17:47:46
  Author: bisson
Revision: 198640

free rebuild

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-31 16:28:32 UTC (rev 198639)
+++ PKGBUILD2013-10-31 16:47:46 UTC (rev 198640)
@@ -1,10 +1,10 @@
 # $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=10
+pkgrel=11
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -41,6 +41,7 @@
sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+   sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
 }
 
 build() {



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-10-26 Thread Gaetan Bisson
Date: Saturday, October 26, 2013 @ 09:49:17
  Author: bisson
Revision: 197461

remove options enforced by newer pacman

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 07:49:11 UTC (rev 197460)
+++ PKGBUILD2013-10-26 07:49:17 UTC (rev 197461)
@@ -9,7 +9,7 @@
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
@@ -54,7 +54,6 @@
--sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/bin \
-   --disable-static \
--disable-monodoc \
--enable-compat-libdns_sd \
--enable-compat-howl \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-07-18 Thread Gaetan Bisson
Date: Thursday, July 18, 2013 @ 11:55:01
  Author: bisson
Revision: 190828

make dbus a hard dependency: already pulled by [base] and libavahi-client.so 
anyway

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-18 07:23:31 UTC (rev 190827)
+++ PKGBUILD2013-07-18 09:55:01 UTC (rev 190828)
@@ -4,15 +4,14 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=9
+pkgrel=10
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
-optdepends=('dbus: communicating with client applications'
-'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt4: qt4 bindings'
@@ -39,6 +38,7 @@
 
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
+   sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-05-15 Thread Gaetan Bisson
Date: Wednesday, May 15, 2013 @ 15:14:03
  Author: bisson
Revision: 185589

move binaries to /usr/bin, misc cleanup

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-15 12:02:15 UTC (rev 185588)
+++ PKGBUILD2013-05-15 13:14:03 UTC (rev 185589)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=7
+pkgrel=8
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -39,21 +39,22 @@
 
 prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
-   sed 's/netdev/network/g' -i avahi-daemon/avahi-dbus.conf
+   sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
+   sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+   sed 's:sbin:bin:g' -i */*.service.in
 }
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
export MOC_QT3=/usr/bin/moc-qt3
export MOC_QT4=/usr/bin/moc-qt4
+   export PYTHON=/usr/bin/python2
 
-   # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
-   PYTHON=python2 \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+   --sbindir=/usr/bin \
--disable-static \
--disable-monodoc \
--enable-compat-libdns_sd \
@@ -70,13 +71,9 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
+   rm -fr ${pkgdir}/etc/rc.d
 
-   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
-
# howl and mdnsresponder compatability
-   (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s 
avahi-compat-howl howl)
-   (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+   cd ${pkgdir}/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h 
dns_sd.h; ln -s avahi-compat-howl howl
+   cd ${pkgdir}/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-05-15 Thread Gaetan Bisson
Date: Thursday, May 16, 2013 @ 05:21:53
  Author: bisson
Revision: 185615

fix FS#35314

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-16 03:14:17 UTC (rev 185614)
+++ PKGBUILD2013-05-16 03:21:53 UTC (rev 185615)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=8
+pkgrel=9
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -41,7 +41,6 @@
cd ${srcdir}/${pkgname}-${pkgver}
sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
-   sed 's:sbin:bin:g' -i */*.service.in
 }
 
 build() {



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

2013-05-13 Thread 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
===
--- PKGBUILD2013-05-13 09:39:29 UTC (rev 185316)
+++ PKGBUILD2013-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 21
- if [ $? -gt 0 ]; then



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-04-27 Thread Gaetan Bisson
Date: Saturday, April 27, 2013 @ 19:31:01
  Author: bisson
Revision: 183747

rebuild for libpng-1.6

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-27 17:24:01 UTC (rev 183746)
+++ PKGBUILD2013-04-27 17:31:01 UTC (rev 183747)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=6
+pkgrel=7
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-04-09 Thread Eric Bélanger
Date: Tuesday, April 9, 2013 @ 23:22:17
  Author: eric
Revision: 182388

Add build fix for qt3 in /usr

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-09 21:20:53 UTC (rev 182387)
+++ PKGBUILD2013-04-09 21:22:17 UTC (rev 182388)
@@ -45,10 +45,8 @@
sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
patch -p1 -i ../rc.d.patch
 
-   export MOC_QT3=/opt/qt/bin/moc
-   export MOC_QT4=/usr/lib/qt4/bin/moc
-   source /etc/profile.d/qt3.sh
-   source /etc/profile.d/qt4.sh
+   export MOC_QT3=/usr/bin/moc-qt3
+   export MOC_QT4=/usr/bin/moc-qt4
 
# pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
PYTHON=python2 \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-02-19 Thread Gaetan Bisson
Date: Wednesday, February 20, 2013 @ 03:16:09
  Author: bisson
Revision: 178315

implement FS#33930

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 01:15:54 UTC (rev 178314)
+++ PKGBUILD2013-02-20 02:16:09 UTC (rev 178315)
@@ -26,7 +26,9 @@
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'
 'etc/avahi/services/ssh.service'
-'etc/avahi/services/sftp-ssh.service')
+'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'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2013-02-19 Thread Gaetan Bisson
Date: Wednesday, February 20, 2013 @ 03:27:38
  Author: bisson
Revision: 178316

fix FS#33937

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 02:16:09 UTC (rev 178315)
+++ PKGBUILD2013-02-20 02:27:38 UTC (rev 178316)
@@ -75,6 +75,7 @@
 
cd ${pkgdir}
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
 
# howl and mdnsresponder compatability
(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s 
avahi-compat-howl howl)



[arch-commits] Commit in avahi/trunk (PKGBUILD install)

2013-02-18 Thread Gaetan Bisson
Date: Tuesday, February 19, 2013 @ 02:56:07
  Author: bisson
Revision: 178284

ready for qt4; waiting on FS#33921

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/install

--+
 PKGBUILD |   12 
 install  |   11 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-19 01:54:39 UTC (rev 178283)
+++ PKGBUILD2013-02-19 01:56:07 UTC (rev 178284)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -15,13 +15,13 @@
 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
-'qt: qt bindings'
+'qt4: qt4 bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
 'twisted: avahi-bookmarks'
 'mono: mono bindings'
 'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'
@@ -43,9 +43,13 @@
sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
patch -p1 -i ../rc.d.patch
 
+   export MOC_QT3=/opt/qt/bin/moc
+   export MOC_QT4=/usr/lib/qt4/bin/moc
+   source /etc/profile.d/qt3.sh
+   source /etc/profile.d/qt4.sh
+
# pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
PYTHON=python2 \
-   PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
./configure \
--prefix=/usr \
--sysconfdir=/etc \

Modified: install
===
--- install 2013-02-19 01:54:39 UTC (rev 178283)
+++ install 2013-02-19 01:56:07 UTC (rev 178284)
@@ -1,8 +1,8 @@
 post_install() {
-  getent group avahi /dev/null || groupadd -r -g 84 avahi /dev/null
-  getent passwd avahi /dev/null || useradd -r -u 84 -g avahi -d / -s 
/bin/false -c avahi avahi /dev/null
+   getent group avahi /dev/null || groupadd -r -g 84 avahi /dev/null
+   getent passwd avahi /dev/null || useradd -r -u 84 -g avahi -d / -s 
/bin/false -c avahi avahi /dev/null
 
-  cat EOF
+   cat EOF
 == The following daemons may be added to DAEMONS in /etc/rc.conf:
 == avahi-daemon: the mdns responder, you probably want this.
 ==   dbus needs to be running when you start it.
@@ -16,6 +16,7 @@
 }
 
 post_remove() {
-  getent passwd avahi /dev/null  userdel avahi /dev/null
-  getent group avahi /dev/null  groupdel avahi /dev/null
+   getent passwd avahi /dev/null  userdel avahi /dev/null
+   getent group avahi /dev/null  groupdel avahi /dev/null
+   true
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-11-25 Thread Gaetan Bisson
Date: Sunday, November 25, 2012 @ 21:21:05
  Author: bisson
Revision: 171998

make dbus dependency optional

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-25 21:50:28 UTC (rev 171997)
+++ PKGBUILD2012-11-26 02:21:05 UTC (rev 171998)
@@ -4,23 +4,24 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=4
+pkgrel=5
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64')
 options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
+optdepends=('dbus: communicating with client applications'
+'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
 'twisted: avahi-bookmarks'
 'mono: mono bindings'
-'dbus-python: avahi-discover'
+'python2-dbus: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'python2-dbus'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-09-09 Thread Gaetan Bisson
Date: Monday, September 10, 2012 @ 00:36:53
  Author: bisson
Revision: 166538

fix FS#31481

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-10 04:31:29 UTC (rev 166537)
+++ PKGBUILD2012-09-10 04:36:53 UTC (rev 166538)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=3
+pkgrel=4
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -21,7 +21,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
 'etc/avahi/avahi-daemon.conf'
 'etc/avahi/services/ssh.service'
@@ -29,7 +29,6 @@
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
 'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
-  'cf56387c88aed246b9f435efc182ef44de4d52f3'
   '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
 conflicts=('howl' 'mdnsresponder')



[arch-commits] Commit in avahi/trunk (PKGBUILD gnome-nettool.png)

2012-07-16 Thread Gaetan Bisson
Date: Monday, July 16, 2012 @ 11:31:35
  Author: bisson
Revision: 163596

remove unneeded file as per FS#30703

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/gnome-nettool.png

--+
 PKGBUILD |2 --
 1 file changed, 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-16 14:47:35 UTC (rev 163595)
+++ PKGBUILD2012-07-16 15:31:35 UTC (rev 163596)
@@ -27,7 +27,6 @@
 'etc/avahi/services/ssh.service'
 'etc/avahi/services/sftp-ssh.service')
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
-'gnome-nettool.png'
 'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
@@ -67,7 +66,6 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-   install -Dm644 ../gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 
cd ${pkgdir}
sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}

Deleted: gnome-nettool.png
===
(Binary files differ)



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-04-18 Thread Gaetan Bisson
Date: Wednesday, April 18, 2012 @ 08:13:30
  Author: bisson
Revision: 156450

indulge FS#29516

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-18 09:57:54 UTC (rev 156449)
+++ PKGBUILD2012-04-18 12:13:30 UTC (rev 156450)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=2
+pkgrel=3
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -35,7 +35,6 @@
 
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
 
 install=install
 



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-04-08 Thread Gaetan Bisson
Date: Sunday, April 8, 2012 @ 18:28:21
  Author: bisson
Revision: 155886

move /lib to /usr/lib

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-08 22:21:02 UTC (rev 155885)
+++ PKGBUILD2012-04-08 22:28:21 UTC (rev 155886)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=1
+pkgrel=2
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-04-06 Thread Dave Reisner
Date: Friday, April 6, 2012 @ 14:26:16
  Author: dreisner
Revision: 155807

move systemdsystemunitdir to /usr

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 18:23:25 UTC (rev 155806)
+++ PKGBUILD2012-04-06 18:26:16 UTC (rev 155807)
@@ -60,7 +60,7 @@
--with-avahi-priv-access-group=network \
--with-autoipd-user=avahi \
--with-autoipd-group=avahi \
-   --with-systemdsystemunitdir=/lib/systemd/system \
+   --with-systemdsystemunitdir=/usr/lib/systemd/system \
 
make
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-03-13 Thread Gaetan Bisson
Date: Tuesday, March 13, 2012 @ 18:48:26
  Author: bisson
Revision: 153436

fix FS#28889

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-13 21:32:08 UTC (rev 153435)
+++ PKGBUILD2012-03-13 22:48:26 UTC (rev 153436)
@@ -22,7 +22,8 @@
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=('etc/avahi/avahi-daemon.conf'
+backup=('etc/avahi/hosts'
+'etc/avahi/avahi-daemon.conf'
 'etc/avahi/services/ssh.service'
 'etc/avahi/services/sftp-ssh.service')
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-02-21 Thread Gaetan Bisson
Date: Tuesday, February 21, 2012 @ 22:37:47
  Author: bisson
Revision: 150781

upstream update

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-22 02:06:52 UTC (rev 150780)
+++ PKGBUILD2012-02-22 03:37:47 UTC (rev 150781)
@@ -3,12 +3,13 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.30
-pkgrel=7
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
+pkgver=0.6.31
+pkgrel=1
+pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool' '!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 'gtk2: gtk2 bindings'
@@ -21,43 +22,44 @@
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
  'gtk-sharp-2' 'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
+backup=('etc/avahi/avahi-daemon.conf'
+'etc/avahi/services/ssh.service'
+'etc/avahi/services/sftp-ssh.service')
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
 'gnome-nettool.png'
 'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
   '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+
+install=install
+
 build() {
cd ${srcdir}/${pkgname}-${pkgver}
 
sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-   patch -p1 -i ../rc.d.patch
+   patch -p1 -i ../rc.d.patch
 
# pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
PYTHON=python2 \
PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-   ./configure \
+   ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--disable-monodoc \
-   --disable-doxygen-doc \
-   --disable-xmltoman \
--enable-compat-libdns_sd \
--enable-compat-howl \
--with-distro=archlinux \
--with-avahi-priv-access-group=network \
--with-autoipd-user=avahi \
--with-autoipd-group=avahi \
-   --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+   --with-systemdsystemunitdir=/lib/systemd/system \
 
make
 }
@@ -65,10 +67,11 @@
 package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-   install -D -m 644 ../gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
+   install -Dm644 ../gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 
cd ${pkgdir}
sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+
# howl and mdnsresponder compatability
(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s 
avahi-compat-howl howl)
(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-01-23 Thread Gaetan Bisson
Date: Monday, January 23, 2012 @ 23:54:29
  Author: bisson
Revision: 147193

rebuild for libpng-1.5

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 04:25:29 UTC (rev 147192)
+++ PKGBUILD2012-01-24 04:54:29 UTC (rev 147193)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=6
+pkgrel=7
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-11-21 Thread Gaetan Bisson
Date: Monday, November 21, 2011 @ 09:00:27
  Author: bisson
Revision: 143031

rebuild for gdbm-1.10-1

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 11:17:17 UTC (rev 143030)
+++ PKGBUILD2011-11-21 14:00:27 UTC (rev 143031)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=5
+pkgrel=6
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-08-20 Thread Allan McRae
Date: Saturday, August 20, 2011 @ 23:33:39
  Author: allan
Revision: 135974

upgpkg: avahi 0.6.30-5

rebuild without unneeded linking to libssp

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 03:22:53 UTC (rev 135973)
+++ PKGBUILD2011-08-21 03:33:39 UTC (rev 135974)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=4
+pkgrel=5
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-04-05 Thread Gaetan Bisson
Date: Tuesday, April 5, 2011 @ 12:48:17
  Author: bisson
Revision: 118149

upstream update

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 16:46:26 UTC (rev 118148)
+++ PKGBUILD2011-04-05 16:48:17 UTC (rev 118149)
@@ -3,15 +3,14 @@
 # Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.29
-pkgrel=2
+pkgver=0.6.30
+pkgrel=1
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-'gtk2: gtk2 bindings'
+optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -20,7 +19,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+ 'gtk-sharp-2' 'gobject-introspection')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -30,7 +29,7 @@
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
 avahi-daemon-dbus.patch
 gnome-nettool.png)
-sha1sums=('af13ae6fdb3cd61b2eafa25a108773156d88b362'
+sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
@@ -48,6 +47,7 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
+--disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-04-05 Thread Gaetan Bisson
Date: Tuesday, April 5, 2011 @ 12:50:00
  Author: bisson
Revision: 118154

upstream update to [gnome-unstable]

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 16:48:42 UTC (rev 118153)
+++ PKGBUILD2011-04-05 16:50:00 UTC (rev 118154)
@@ -4,13 +4,14 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=1
+pkgrel=2
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -19,7 +20,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection')
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -47,7 +48,6 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
---disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-04-05 Thread Gaetan Bisson
Date: Tuesday, April 5, 2011 @ 12:56:06
  Author: bisson
Revision: 118159

upstream update to [extra]

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 16:50:30 UTC (rev 118158)
+++ PKGBUILD2011-04-05 16:56:06 UTC (rev 118159)
@@ -4,14 +4,13 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=2
+pkgrel=1
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-'gtk2: gtk2 bindings'
+optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -20,7 +19,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+ 'gtk-sharp-2' 'gobject-introspection')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -48,6 +47,7 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
+--disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-04-05 Thread Gaetan Bisson
Date: Tuesday, April 5, 2011 @ 12:57:59
  Author: bisson
Revision: 118164

upstream update to [gnome-unstable]

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-05 16:56:24 UTC (rev 118163)
+++ PKGBUILD2011-04-05 16:57:59 UTC (rev 118164)
@@ -4,13 +4,14 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=1
+pkgrel=2
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -19,7 +20,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection')
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -47,7 +48,6 @@
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
---disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-03-09 Thread Gaetan Bisson
Date: Wednesday, March 9, 2011 @ 13:23:43
  Author: bisson
Revision: 113561

upstream update to [extra]

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-09 16:58:28 UTC (rev 113560)
+++ PKGBUILD2011-03-09 18:23:43 UTC (rev 113561)
@@ -1,16 +1,16 @@
 # $Id$
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.28
-pkgrel=2
+pkgver=0.6.29
+pkgrel=1
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-'gtk2: gtk2 bindings'
+optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -19,7 +19,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+ 'gtk-sharp-2' 'gobject-introspection')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -29,7 +29,7 @@
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
 avahi-daemon-dbus.patch
 gnome-nettool.png)
-sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67'
+sha1sums=('af13ae6fdb3cd61b2eafa25a108773156d88b362'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
@@ -41,11 +41,12 @@
 
   # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
   PYTHON=python2 \
-  PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
+--disable-static \
+--disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-03-09 Thread Gaetan Bisson
Date: Wednesday, March 9, 2011 @ 13:25:47
  Author: bisson
Revision: 113566

upstream update to [gnome-unstable]

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-09 18:24:03 UTC (rev 113565)
+++ PKGBUILD2011-03-09 18:25:47 UTC (rev 113566)
@@ -4,13 +4,14 @@
 
 pkgname=avahi
 pkgver=0.6.29
-pkgrel=1
+pkgrel=2
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk2: avahi-discover-standalone, bshell, bssh, bvnc'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -19,7 +20,7 @@
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
- 'gtk-sharp-2' 'gobject-introspection')
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -41,12 +42,12 @@
 
   # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
   PYTHON=python2 \
+  PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
 --disable-static \
---disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2011-02-13 Thread Jan Steffens
Date: Sunday, February 13, 2011 @ 11:23:27
  Author: heftig
Revision: 109883

upgpkg: avahi 0.6.28-2
Update for gnome-unstable

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-13 15:28:49 UTC (rev 109882)
+++ PKGBUILD2011-02-13 16:23:27 UTC (rev 109883)
@@ -3,13 +3,14 @@
 
 pkgname=avahi
 pkgver=0.6.28
-pkgrel=1
+pkgrel=2
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk2: avahi-discover-standalone'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -17,7 +18,8 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection=0.9.10')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -39,11 +41,11 @@
 
   # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
   PYTHON=python2 \
+  PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
---disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-11-28 Thread Gaetan Bisson
Date: Sunday, November 28, 2010 @ 06:20:11
  Author: bisson
Revision: 101127

make python version explicit, fixes FS#21865

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-28 11:19:54 UTC (rev 101126)
+++ PKGBUILD2010-11-28 11:20:11 UTC (rev 101127)
@@ -37,7 +37,9 @@
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
   patch -Np0 -i ${srcdir}/avahi-daemon-dbus.patch
 
-  ./configure \
+  # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
+  PYTHON=python2 \
+./configure \
 --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \



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

2010-11-19 Thread Gaetan Bisson
Date: Friday, November 19, 2010 @ 13:41:25
  Author: bisson
Revision: 11

upstream bugfix update, one patch down

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/introspection.patch

-+
 PKGBUILD|   13 +
 introspection.patch |   18 --
 2 files changed, 5 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-19 17:40:38 UTC (rev 10)
+++ PKGBUILD2010-11-19 18:41:25 UTC (rev 11)
@@ -2,8 +2,8 @@
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.27
-pkgrel=7
+pkgver=0.6.28
+pkgrel=1
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -26,19 +26,16 @@
 options=('!libtool')
 source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
 avahi-daemon-dbus.patch
-gnome-nettool.png
-introspection.patch)
-sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
+gnome-nettool.png)
+sha1sums=('5da3f7da2cff8ddf74f8746e4dcb2524e5047f67'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-  'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  '999d71add829ab9bb55262855dfe04126ac7975c')
+  'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
   patch -Np0 -i ${srcdir}/avahi-daemon-dbus.patch
-  patch -Np1 -i ${srcdir}/introspection.patch
 
   ./configure \
 --prefix=/usr \

Deleted: introspection.patch
===
--- introspection.patch 2010-11-19 17:40:38 UTC (rev 10)
+++ introspection.patch 2010-11-19 18:41:25 UTC (rev 11)
@@ -1,18 +0,0 @@
-diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir 
avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir
 avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
-+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-30 
16:16:41.26339 +0200
-@@ -1,10 +1,12 @@
- ?xml version=1.0?
--repository version=1.0
-+repository version=1.2
- xmlns=http://www.gtk.org/introspection/core/1.0;
- xmlns:c=http://www.gtk.org/introspection/c/1.0;
- xmlns:glib=http://www.gtk.org/introspection/glib/1.0;
-   namespace name=AvahiCore version=0.6 shared-library=avahi-core
--alias name=IfIndex target=int c:type=AvahiIfIndex/
-+alias name=IfIndex target=int
-+  type name=AvahiIfIndex c:type=AvahiIfIndex/
-+/alias
- enumeration name=Protocol c:type=AvahiProtocol
-   member name=inet
-   value=0



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

2010-10-02 Thread Gaetan Bisson
Date: Saturday, October 2, 2010 @ 13:26:53
  Author: bisson
Revision: 92979

revert to old patch with versionned depends

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/introspection.patch

-+
 PKGBUILD|4 ++--
 introspection.patch |   12 
 2 files changed, 2 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-02 16:41:37 UTC (rev 92978)
+++ PKGBUILD2010-10-02 17:26:53 UTC (rev 92979)
@@ -17,7 +17,7 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection=0.9.10')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -31,7 +31,7 @@
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  'ff70358eab95ad5b445c1a584d4a889e4474a25d')
+  '999d71add829ab9bb55262855dfe04126ac7975c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: introspection.patch
===
--- introspection.patch 2010-10-02 16:41:37 UTC (rev 92978)
+++ introspection.patch 2010-10-02 17:26:53 UTC (rev 92979)
@@ -16,15 +16,3 @@
  enumeration name=Protocol c:type=AvahiProtocol
member name=inet
value=0
-diff -aur avahi-0.6.27/configure.ac avahi-0.6.27-introspection/configure.ac
 avahi-0.6.27/configure.ac  2010-07-13 05:05:05.464755077 +0200
-+++ avahi-0.6.27-introspection/configure.ac2010-09-30 16:17:06.10559 
+0200
-@@ -472,7 +472,7 @@
- #
- # Introspection support.
- #
--GOBJECT_INTROSPECTION_CHECK([0.6.7])
-+GOBJECT_INTROSPECTION_CHECK([0.9.5])
- 
- #
- # Check for Qt 3



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-10-02 Thread Gaetan Bisson
Date: Saturday, October 2, 2010 @ 13:28:41
  Author: bisson
Revision: 92984

staging build

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-02 17:28:01 UTC (rev 92983)
+++ PKGBUILD2010-10-02 17:28:41 UTC (rev 92984)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=5
+pkgrel=6
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



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

2010-09-30 Thread Gaetan Bisson
Date: Thursday, September 30, 2010 @ 15:59:42
  Author: bisson
Revision: 92762

fixes FS#20999 and introspection.patch build problems

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/introspection.patch

-+
 PKGBUILD|6 +++---
 introspection.patch |   15 ++-
 2 files changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-30 19:24:56 UTC (rev 92761)
+++ PKGBUILD2010-09-30 19:59:42 UTC (rev 92762)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=4
+pkgrel=5
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -31,7 +31,7 @@
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3'
-  '9a585c2b851641511705ac9b423311ac650653cc')
+  'ff70358eab95ad5b445c1a584d4a889e4474a25d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -54,7 +54,7 @@
 --with-avahi-priv-access-group=network \
 --with-autoipd-user=avahi \
 --with-autoipd-group=avahi \
---with-systemdsystemunitdir=/usr/share/dbus-1/system-services # See 
FS#20519
+--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
 
   make
 }

Modified: introspection.patch
===
--- introspection.patch 2010-09-30 19:24:56 UTC (rev 92761)
+++ introspection.patch 2010-09-30 19:59:42 UTC (rev 92762)
@@ -1,5 +1,6 @@
+diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir 
avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir
 --- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
-+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-29 
19:08:53.503339092 +0200
 avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-30 
16:16:41.26339 +0200
 @@ -1,10 +1,12 @@
  ?xml version=1.0?
 -repository version=1.0
@@ -15,3 +16,15 @@
  enumeration name=Protocol c:type=AvahiProtocol
member name=inet
value=0
+diff -aur avahi-0.6.27/configure.ac avahi-0.6.27-introspection/configure.ac
+--- avahi-0.6.27/configure.ac  2010-07-13 05:05:05.464755077 +0200
 avahi-0.6.27-introspection/configure.ac2010-09-30 16:17:06.10559 
+0200
+@@ -472,7 +472,7 @@
+ #
+ # Introspection support.
+ #
+-GOBJECT_INTROSPECTION_CHECK([0.6.7])
++GOBJECT_INTROSPECTION_CHECK([0.9.5])
+ 
+ #
+ # Check for Qt 3



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

2010-09-29 Thread Jan de Groot
Date: Wednesday, September 29, 2010 @ 13:34:26
  Author: jgc
Revision: 92405

upgpkg: avahi 0.6.27-4
Fix and enable introspection support

Added:
  avahi/trunk/introspection.patch
Modified:
  avahi/trunk/PKGBUILD

-+
 PKGBUILD|   17 ++---
 introspection.patch |   17 +
 2 files changed, 27 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-29 16:42:09 UTC (rev 92404)
+++ PKGBUILD2010-09-29 17:34:26 UTC (rev 92405)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=3
+pkgrel=4
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -17,25 +17,28 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 
'gobject-introspection')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
-'avahi-daemon-dbus.patch'
-'gnome-nettool.png')
+source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
+avahi-daemon-dbus.patch
+gnome-nettool.png
+introspection.patch)
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-  'cf56387c88aed246b9f435efc182ef44de4d52f3')
+  'cf56387c88aed246b9f435efc182ef44de4d52f3'
+  '9a585c2b851641511705ac9b423311ac650653cc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-  patch -p0  ../avahi-daemon-dbus.patch
+  patch -Np0 -i ${srcdir}/avahi-daemon-dbus.patch
+  patch -Np1 -i ${srcdir}/introspection.patch
 
   ./configure \
 --prefix=/usr \

Added: introspection.patch
===
--- introspection.patch (rev 0)
+++ introspection.patch 2010-09-29 17:34:26 UTC (rev 92405)
@@ -0,0 +1,17 @@
+--- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir   2010-06-27 
02:38:43.018291433 +0200
 avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir 2010-09-29 
19:08:53.503339092 +0200
+@@ -1,10 +1,12 @@
+ ?xml version=1.0?
+-repository version=1.0
++repository version=1.2
+ xmlns=http://www.gtk.org/introspection/core/1.0;
+ xmlns:c=http://www.gtk.org/introspection/c/1.0;
+ xmlns:glib=http://www.gtk.org/introspection/glib/1.0;
+   namespace name=AvahiCore version=0.6 shared-library=avahi-core
+-alias name=IfIndex target=int c:type=AvahiIfIndex/
++alias name=IfIndex target=int
++  type name=AvahiIfIndex c:type=AvahiIfIndex/
++/alias
+ enumeration name=Protocol c:type=AvahiProtocol
+   member name=inet
+   value=0



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-09-04 Thread Rémy Oudompheng
Date: Saturday, September 4, 2010 @ 09:54:42
  Author: remy
Revision: 89844

upgpkg: avahi 0.6.27-3
Rebuild for python 2.7

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-04 12:16:12 UTC (rev 89843)
+++ PKGBUILD2010-09-04 13:54:42 UTC (rev 89844)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=2
+pkgrel=3
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-08-19 Thread Gaetan Bisson
Date: Thursday, August 19, 2010 @ 03:09:03
  Author: bisson
Revision: 88020

better optdepends

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-19 06:05:27 UTC (rev 88019)
+++ PKGBUILD2010-08-19 07:09:03 UTC (rev 88020)
@@ -9,13 +9,16 @@
 url='http://www.avahi.org/'
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('pygtk: avahi-discover'
+optdepends=('gtk2: avahi-discover-standalone'
+'libglade: avahi-discover, avahi-discover-standalone'
+'qt3: qt3 bindings'
+'qt: qt bindings'
+'pygtk: avahi-bookmarks, avahi-discover'
+'twisted: avahi-bookmarks'
+'mono: mono bindings'
 'dbus-python: avahi-discover'
-'gtk2: avahi-discover-standalone'
-'libglade: avahi-discover-standalone'
-'pygtk: avahi-bookmarks'
-'twisted: avahi-bookmarks')
-makedepends=('qt' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 
'gtk-sharp-2')
+'nss-mdns: NSS support for mDNS')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 
'gtk-sharp-2')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -29,7 +32,6 @@
   '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
   'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -41,7 +43,6 @@
 --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
---disable-qt3 \
 --disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-08-19 Thread Gaetan Bisson
Date: Thursday, August 19, 2010 @ 13:38:44
  Author: bisson
Revision: 88129

fix FS#20519

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-19 15:21:59 UTC (rev 88128)
+++ PKGBUILD2010-08-19 17:38:44 UTC (rev 88129)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.27
-pkgrel=1
+pkgrel=2
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'
@@ -52,7 +52,8 @@
 --with-distro=archlinux \
 --with-avahi-priv-access-group=network \
 --with-autoipd-user=avahi \
---with-autoipd-group=avahi
+--with-autoipd-group=avahi \
+--with-systemdsystemunitdir=/usr/share/dbus-1/system-services # See 
FS#20519
 
   make
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD avahi.install)

2010-08-19 Thread Gaetan Bisson
Date: Thursday, August 19, 2010 @ 15:44:20
  Author: bisson
Revision: 88141

removed unneeded libglade optdepends+makedepends
removed patching of the pkg-config file (I cannot reproduce the bug of FS#18451 
which introduced this patch)
cleaner install script

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/avahi.install

---+
 PKGBUILD  |4 +---
 avahi.install |   45 -
 2 files changed, 13 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-19 19:25:26 UTC (rev 88140)
+++ PKGBUILD2010-08-19 19:44:20 UTC (rev 88141)
@@ -10,7 +10,6 @@
 license=('LGPL')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
 optdepends=('gtk2: avahi-discover-standalone'
-'libglade: avahi-discover, avahi-discover-standalone'
 'qt3: qt3 bindings'
 'qt: qt bindings'
 'pygtk: avahi-bookmarks, avahi-discover'
@@ -18,7 +17,7 @@
 'mono: mono bindings'
 'dbus-python: avahi-discover'
 'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'qt3' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 
'gtk-sharp-2')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
@@ -35,7 +34,6 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  sed -i 's/Requires.private/Requires/' avahi-qt4.pc.in
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
   patch -p0  ../avahi-daemon-dbus.patch
 

Modified: avahi.install
===
--- avahi.install   2010-08-19 19:25:26 UTC (rev 88140)
+++ avahi.install   2010-08-19 19:44:20 UTC (rev 88141)
@@ -1,42 +1,21 @@
 post_install() {
-  echo -n adding avahi system group... 
-  groupadd -g 84 avahi  echo done.
-  echo -n adding avahi system user... 
-  useradd -c Avahi daemon -u 84 -d / -g avahi -s /bin/false avahi \
- echo done.
-  passwd -l avahi /dev/null
+  getent group avahi /dev/null || groupadd -r -g 84 avahi /dev/null
+  getent passwd avahi /dev/null || useradd -r -u 84 -g avahi -d / -s 
/bin/false -c avahi avahi /dev/null
 
-  post_upgrade
-  cat  'EOM'
+  cat EOF
 == The following daemons may be added to DAEMONS in /etc/rc.conf:
- - avahi-daemon   - the mdns responder, you probably want this.
- dbus needs to be running when you start it.
- - avahi-dnsconfd - daemon used for peer-to-peer automatic dns
- configuration on dhcp-less networks.
+== avahi-daemon: the mdns responder, you probably want this.
+==   dbus needs to be running when you start it.
+== avahi-dnsconfd: daemon used for peer-to-peer automatic dns
+== configuration on dhcp-less networks.
 
 == To use some of the client applications you will have to install python.
- - In addition, pygtk is required for the graphical ones and
-twisted-web for avahi-bookmarks.
-
-EOM
+== In addition, pygtk is required for the graphical ones and
+== twisted for avahi-bookmarks.
+EOF
 }
 
-post_upgrade() {
-  true
-}
-
-pre_remove() {
-  # pre_remove gets called whenever post_remove is defined.
-  true
-}
-
 post_remove() {
-  # post_remove doesn't start at a newline like the other post_* functions,
-  # so we'll have to make one for ourselves.
-  echo -n -e \nremoving avahi system user... 
-  userdel avahi  echo done.
+  getent passwd avahi /dev/null  userdel avahi /dev/null
+  getent group avahi /dev/null  groupdel avahi /dev/null
 }
-
-op=$1
-shift
-$op $*



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-08-18 Thread Gaetan Bisson
Date: Wednesday, August 18, 2010 @ 02:36:59
  Author: bisson
Revision: 87740

adding curly brackets

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-18 06:29:28 UTC (rev 87739)
+++ PKGBUILD2010-08-18 06:36:59 UTC (rev 87740)
@@ -22,7 +22,7 @@
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-$pkgver.tar.gz;
+source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
 'avahi-daemon-dbus.patch'
 'gnome-nettool.png')
 sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
@@ -31,7 +31,7 @@
 
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   sed -i 's/Requires.private/Requires/' avahi-qt4.pc.in
   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
@@ -57,16 +57,16 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR=${pkgdir} install
 
   # howl and mdnsresponder compatability
-  cd $pkgdir/usr/include
+  cd ${pkgdir}/usr/include
   ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
   ln -s avahi-compat-howl howl
-  cd $pkgdir/usr/lib/pkgconfig
+  cd ${pkgdir}/usr/lib/pkgconfig
   ln -s avahi-compat-howl.pc howl.pc
 
-  install -D -m 644 $srcdir/gnome-nettool.png 
$pkgdir/usr/share/pixmaps/gnome-nettool.png
+  install -D -m 644 ${srcdir}/gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 }



[arch-commits] Commit in avahi/trunk (PKGBUILD avahi-daemon-dbus.patch)

2010-08-17 Thread Gaetan Bisson
Date: Tuesday, August 17, 2010 @ 18:39:49
  Author: bisson
Revision: 87694

upstream bug/security-fix update, and some packaging changes:
- removed old versioned dependencies
- build against qt rather than qt3
- simplified avahi-daemon patch

Modified:
  avahi/trunk/PKGBUILD
  avahi/trunk/avahi-daemon-dbus.patch

-+
 PKGBUILD|   73 +++---
 avahi-daemon-dbus.patch |   19 ---
 2 files changed, 44 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 21:39:29 UTC (rev 87693)
+++ PKGBUILD2010-08-17 22:39:49 UTC (rev 87694)
@@ -2,40 +2,47 @@
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=avahi
-pkgver=0.6.25
-pkgrel=3
-pkgdesc=A multicast/unicast DNS-SD framework
+pkgver=0.6.27
+pkgrel=1
+pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
-url=http://www.avahi.org/;
+url='http://www.avahi.org/'
 license=('LGPL')
-depends=('dbus=1.1.20-1' 'libcap=2.16' 'libdaemon=0.11' 'gdbm' 'glib2' 
'expat')
-optdepends=('qt3: Qt3 UI support'
-   'libglade: avahi-discover-standalone'
-   'nss-mdns: NSS support for mDNS'
-   'pygtk: avahi-discover'
-   'dbus-python: avahi-discover')
-makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 
'intltool')
+depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+optdepends=('pygtk: avahi-discover'
+'dbus-python: avahi-discover'
+'gtk2: avahi-discover-standalone'
+'libglade: avahi-discover-standalone'
+'pygtk: avahi-bookmarks'
+'twisted: avahi-bookmarks')
+makedepends=('qt' 'pygtk' 'mono' 'libglade' 'intltool' 'dbus-python' 
'gtk-sharp-2')
 backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
 install=avahi.install
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png 
avahi-daemon-dbus.patch)
+source=(http://www.avahi.org/download/avahi-$pkgver.tar.gz;
+'avahi-daemon-dbus.patch'
+'gnome-nettool.png')
+sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
+  '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
+  'cf56387c88aed246b9f435efc182ef44de4d52f3')
 
+
 build() {
-  [ -z ${QTDIR} ]  . /etc/profile.d/qt3.sh
-  export MONO_SHARED_DIR=${srcdir}/.wabi
-  mkdir -p ${MONO_SHARED_DIR}
+  cd $srcdir/$pkgname-$pkgver
 
-  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's/Requires.private/Requires/' avahi-qt4.pc.in
+  sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+  patch -p0  ../avahi-daemon-dbus.patch
 
-  sed -i 's|Requires.private|Requires|' avahi-qt3.pc.in
-
-  ./configure --prefix=/usr \
+  ./configure \
+--prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
---disable-qt4 \
+--disable-qt3 \
+--disable-gtk3 \
 --disable-monodoc \
 --disable-doxygen-doc \
 --disable-xmltoman \
@@ -43,29 +50,23 @@
 --enable-compat-howl \
 --with-distro=archlinux \
 --with-avahi-priv-access-group=network \
---enable-autoipd \
 --with-autoipd-user=avahi \
 --with-autoipd-group=avahi
 
-  make || return 1
-  make DESTDIR=${pkgdir} install
+  make
+}
 
-  rm -rf ${MONO_SHARED_DIR}
-  
-  sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf
-   
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
   # howl and mdnsresponder compatability
-  cd ${pkgdir}/usr/include
+  cd $pkgdir/usr/include
   ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
   ln -s avahi-compat-howl howl
-  cd ${pkgdir}/usr/lib/pkgconfig
+  cd $pkgdir/usr/lib/pkgconfig
   ln -s avahi-compat-howl.pc howl.pc
-  mkdir -p ${pkgdir}/usr/share/pixmaps
-  install -m 644 ${srcdir}/gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 
-  cd ${pkgdir}
-  patch -p0  ${srcdir}/avahi-daemon-dbus.patch || return 1
+  install -D -m 644 $srcdir/gnome-nettool.png 
$pkgdir/usr/share/pixmaps/gnome-nettool.png
 }
-md5sums=('a83155a6e29e3988f07e5eea3287b21e'
- '42c2905307c7a5dc6ac4b75f4c3d65a3'
-'0e1f5900b56fcfa1bffddb4f233f539f')

Modified: avahi-daemon-dbus.patch
===
--- avahi-daemon-dbus.patch 2010-08-17 21:39:29 UTC (rev 87693)
+++ avahi-daemon-dbus.patch 2010-08-17 22:39:49 UTC (rev 87694)
@@ -1,16 +1,11 @@
 etc/rc.d/avahi-daemon  2010-02-26 21:10:30.0 -0600
-+++ etc/rc.d/avahi-daemon  2010-02-26 21:09:44.0 -0600
-@@ -35,8 +35,11 @@
+--- initscript/archlinux/avahi-daemon.in   2010-08-17 22:23:46.510293144 
+0200
 initscript/archlinux/avahi-daemon.in   2010-08-17 22:46:58.110163026 
+0200
+@@ -33,6 +35,8 @@
  
  case $1 in
  start)
--stat_busy Starting 

[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-02-26 Thread Daniel Griffiths
Date: Friday, February 26, 2010 @ 22:24:54
  Author: dgriffiths
Revision: 70504

FS#13872

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-27 02:36:52 UTC (rev 70503)
+++ PKGBUILD2010-02-27 03:24:54 UTC (rev 70504)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.25
-pkgrel=2
+pkgrel=3
 pkgdesc=A multicast/unicast DNS-SD framework
 arch=('i686' 'x86_64')
 url=http://www.avahi.org/;
@@ -21,7 +21,7 @@
 provides=('howl' 'mdnsresponder')
 replaces=('howl' 'mdnsresponder')
 options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png)
+source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png 
avahi-daemon-dbus.patch)
 
 build() {
   [ -z ${QTDIR} ]  . /etc/profile.d/qt3.sh
@@ -52,9 +52,6 @@
 
   rm -rf ${MONO_SHARED_DIR}
   
-  #fix capability
-  sed -i -e 's|$DAEMON -D |modprobe capability   /dev/null 2\1 ;  $DAEMON 
-D |' ${pkgdir}/etc/rc.d/avahi-daemon
-
   sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf

   # howl and mdnsresponder compatability
@@ -65,6 +62,10 @@
   ln -s avahi-compat-howl.pc howl.pc
   mkdir -p ${pkgdir}/usr/share/pixmaps
   install -m 644 ${srcdir}/gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
+
+  cd ${pkgdir}
+  patch -p0  ${srcdir}/avahi-daemon-dbus.patch || return 1
 }
 md5sums=('a83155a6e29e3988f07e5eea3287b21e'
- '42c2905307c7a5dc6ac4b75f4c3d65a3')
+ '42c2905307c7a5dc6ac4b75f4c3d65a3'
+'0e1f5900b56fcfa1bffddb4f233f539f')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2010-02-25 Thread Daniel Griffiths
Date: Thursday, February 25, 2010 @ 16:39:03
  Author: dgriffiths
Revision: 70290

FS#18451

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-25 21:24:47 UTC (rev 70289)
+++ PKGBUILD2010-02-25 21:39:03 UTC (rev 70290)
@@ -3,7 +3,7 @@
 
 pkgname=avahi
 pkgver=0.6.25
-pkgrel=1
+pkgrel=2
 pkgdesc=A multicast/unicast DNS-SD framework
 arch=('i686' 'x86_64')
 url=http://www.avahi.org/;
@@ -25,10 +25,13 @@
 
 build() {
   [ -z ${QTDIR} ]  . /etc/profile.d/qt3.sh
-  export MONO_SHARED_DIR=${startdir}/src/.wabi
+  export MONO_SHARED_DIR=${srcdir}/.wabi
   mkdir -p ${MONO_SHARED_DIR}
 
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  sed -i 's|Requires.private|Requires|' avahi-qt3.pc.in
+
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \
@@ -45,23 +48,23 @@
 --with-autoipd-group=avahi
 
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install
 
   rm -rf ${MONO_SHARED_DIR}
   
   #fix capability
-  sed -i -e 's|$DAEMON -D |modprobe capability   /dev/null 2\1 ;  $DAEMON 
-D |' ${startdir}/pkg/etc/rc.d/avahi-daemon
+  sed -i -e 's|$DAEMON -D |modprobe capability   /dev/null 2\1 ;  $DAEMON 
-D |' ${pkgdir}/etc/rc.d/avahi-daemon
 
-  sed -i -e 's/netdev/network/g' 
${startdir}/pkg/etc/dbus-1/system.d/avahi-dbus.conf
+  sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf

   # howl and mdnsresponder compatability
-  cd ${startdir}/pkg/usr/include
+  cd ${pkgdir}/usr/include
   ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
   ln -s avahi-compat-howl howl
-  cd ${startdir}/pkg/usr/lib/pkgconfig
+  cd ${pkgdir}/usr/lib/pkgconfig
   ln -s avahi-compat-howl.pc howl.pc
-  mkdir -p ${startdir}/pkg/usr/share/pixmaps
-  install -m 644 ${startdir}/src/gnome-nettool.png 
${startdir}/pkg/usr/share/pixmaps/gnome-nettool.png
+  mkdir -p ${pkgdir}/usr/share/pixmaps
+  install -m 644 ${srcdir}/gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
 }
 md5sums=('a83155a6e29e3988f07e5eea3287b21e'
  '42c2905307c7a5dc6ac4b75f4c3d65a3')



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2009-11-01 Thread Andrea Scarpino
Date: Sunday, November 1, 2009 @ 10:22:30
  Author: andrea
Revision: 57704

FS#16053

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-01 15:20:26 UTC (rev 57703)
+++ PKGBUILD2009-11-01 15:22:30 UTC (rev 57704)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=avahi
 pkgver=0.6.25
@@ -9,8 +9,11 @@
 url=http://www.avahi.org/;
 license=('LGPL')
 depends=('dbus=1.1.20-1' 'libcap=2.16' 'libdaemon=0.11' 'gdbm' 'glib2' 
'expat')
-optdepends=('qt3: Qt3 UI support' 'libglade: avahi-discover-standalone'
-'nss-mdns: NSS support for mDNS' 'pygtk and dbus-python: 
avahi-discover')
+optdepends=('qt3: Qt3 UI support'
+   'libglade: avahi-discover-standalone'
+   'nss-mdns: NSS support for mDNS'
+   'pygtk: avahi-discover'
+   'dbus-python: avahi-discover')
 makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 
'intltool')
 backup=(etc/avahi/avahi-daemon.conf)
 install=avahi.install