--- a/ChangeLog	Thu Jun 26 10:49:32 2008 +0000
+++ b/ChangeLog	Thu Jun 26 10:58:42 2008 +0000
@@ -1,3 +1,9 @@
+2008-06-26  Padraig O'Briain  <[email protected]>
+
+	* patches/avahi-08-man-page.diff:
+	* patches/avahi-13-remove-debug-trap.diff:
+	* base-specs/avahi.spec: Bump to 0.6.23.
+
 2008-06-26  Damien Carbery <[email protected]>
 
 	* cron-script.sh: Enable debug builds for Sun, Tues, Thur, Sat.

--- a/base-specs/avahi.spec	Thu Jun 26 10:49:32 2008 +0000
+++ b/base-specs/avahi.spec	Thu Jun 26 10:58:42 2008 +0000
@@ -8,7 +8,7 @@
 Name:         avahi
 License:      Other
 Group:        System/Libraries
-Version:      0.6.22
+Version:      0.6.23
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -124,7 +124,11 @@
           --disable-gdbm		\
           --enable-dbm"
 
+libtoolize --force
+glib-gettextize -f
+intltoolize --force --copy
 
+autoreconf
 autoheader
 autoconf
 CFLAGS="$RPM_OPT_FLAGS"
@@ -163,6 +167,8 @@
 /sbin/ldconfig
 
 %changelog
+* Thu Jun 26 2008 - [email protected]
+- Uprev to 0.6.23; add calls to libtoolize and autoreconf
 * Fri Jun 06 2008 - [email protected]
 - Uprev to 0.6.22; remove patch -14.
 * Thu Sep 20 2007 - [email protected]

--- a/patches/avahi-08-man-page.diff	Thu Jun 26 10:49:32 2008 +0000
+++ b/patches/avahi-08-man-page.diff	Thu Jun 26 10:58:42 2008 +0000
@@ -347,14 +347,14 @@
 -\fBavahi-daemon(8)\f1
  .SH COMMENTS
  This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
---- /usr/tmp/clean/avahi-0.6.19/man/bssh.1	Wed May  9 16:24:12 2007
-+++ avahi-0.6.19/man/bssh.1	Wed Jun 13 16:06:01 2007
-@@ -10,8 +10,6 @@
- bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/xvncviewer after a selection was made.
- .SH OPTIONS
- bssh/bvnc takes no command line arguments at the moment.
+--- /usr/tmp/clean/avahi-0.6.23/man/bssh.1	2008-06-24 00:29:07.000000000 +0100
++++ avahi-0.6.23/man/bssh.1	2008-06-25 13:56:28.037867000 +0100
+@@ -28,8 +28,6 @@
+ .TP
+ \fB-h | --help\f1
+ Show help.
 -.SH AUTHORS
 -The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1
  .SH SEE ALSO
- \fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBxvncviewer(1)\f1
+ \fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
  .SH COMMENTS

--- a/patches/avahi-13-remove-debug-trap.diff	Thu Jun 26 10:49:32 2008 +0000
+++ b/patches/avahi-13-remove-debug-trap.diff	Thu Jun 26 10:58:42 2008 +0000
@@ -34,8 +34,8 @@
  avahi_commonincludedir=$(includedir)/avahi-common
  
  avahi_commoninclude_HEADERS = \
---- /usr/tmp/clean/avahi-0.6.12/avahi-discover-standalone/Makefile.am	2005-09-25 21:34:48.000000000 +0100
-+++ avahi-0.6.12/avahi-discover-standalone/Makefile.am	2006-08-22 09:36:37.107845000 +0100
+--- /usr/tmp/clean/avahi-0.6.23/avahi-discover-standalone/Makefile.am	2008-06-18 00:13:44.000000000 +0100
++++ avahi-0.6.23/avahi-discover-standalone/Makefile.am	2008-06-25 14:01:51.336793000 +0100
 @@ -22,9 +22,6 @@
  interfaces = \
          avahi-discover.glade
@@ -44,8 +44,8 @@
 -AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 -
  if HAVE_GTK
+ if  HAVE_GLIB
  bin_PROGRAMS = \
- 	avahi-discover-standalone
 --- /usr/tmp/clean/avahi-0.6.12/avahi-client/Makefile.am	2006-03-01 23:27:45.000000000 +0000
 +++ avahi-0.6.12/avahi-client/Makefile.am	2006-08-22 09:37:26.320792000 +0100
 @@ -19,9 +19,6 @@
@@ -130,8 +130,8 @@
  if HAVE_DBUS
  if ENABLE_COMPAT_HOWL
  
---- /usr/tmp/clean/avahi-0.6.19/avahi-core/Makefile.am	Fri Apr 13 00:41:00 2007
-+++ avahi-0.6.19/avahi-core/Makefile.am	Wed Jun  6 13:23:48 2007
+--- /usr/tmp/clean/avahi-0.6.23/avahi-core/Makefile.am	2008-06-23 23:22:38.000000000 +0100
++++ avahi-0.6.23/avahi-core/Makefile.am	2008-06-25 14:06:43.632972000 +0100
 @@ -19,9 +19,6 @@
  
  AM_CFLAGS=-I$(top_srcdir)
@@ -142,7 +142,7 @@
  avahiincludedir=$(includedir)/avahi-core
  
  avahiinclude_HEADERS = \
-@@ -41,7 +38,6 @@
+@@ -41,14 +38,12 @@
  	conformance-test \
  	avahi-reflector \
  	dns-test \
@@ -150,15 +150,14 @@
  	timeeventq-test \
  	hashmap-test \
  	querier-test \
-@@ -48,7 +44,6 @@
  	update-test
  
  TESTS = \
 -	dns-spin-test \
  	dns-test \
  	hashmap-test
- endif  
-@@ -144,11 +139,6 @@
+ endif
+@@ -147,11 +142,6 @@
  dns_test_CFLAGS = $(AM_CFLAGS)
  dns_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la