rpms/avahi/F-8 avahi-0.6.21-multiarch.patch, NONE, 1.1 avahi.spec, 1.96, 1.97 avahi-0.6.11-align.patch, 1.1, NONE avahi-0.6.11-use-ipv6-yes.patch, 1.1, NONE avahi-0.6.15-initscript.patch, 1.1, NONE avahi-0.6.15-netdev.patch, 1.1, NONE avahi-0.6.17-exitcode.patch, 1.1, NONE avahi-0.6.20-arp-packet-fix.patch, 1.1, NONE avahi-0.6.20-cleanup-dns-compression-table.patch, 1.1, NONE avahi-0.6.20-make-known-answers-not-conflict.patch, 1.1, NONE avahi-0.6.9-bz189427.patch, 1.1, NONE

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/avahi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11287/F-8

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.21-multiarch.patch 
Removed Files:
	avahi-0.6.11-align.patch avahi-0.6.11-use-ipv6-yes.patch 
	avahi-0.6.15-initscript.patch avahi-0.6.15-netdev.patch 
	avahi-0.6.17-exitcode.patch avahi-0.6.20-arp-packet-fix.patch 
	avahi-0.6.20-cleanup-dns-compression-table.patch 
	avahi-0.6.20-make-known-answers-not-conflict.patch 
	avahi-0.6.9-bz189427.patch 
Log Message:
- resolves #274731: fix service-types.db multiarch conflict (pulled from upstream SVN r1525)


avahi-0.6.21-multiarch.patch:

--- NEW FILE avahi-0.6.21-multiarch.patch ---
Index: /trunk/service-type-database/Makefile.am
===================================================================
--- /trunk/service-type-database/Makefile.am (revision 1394)
+++ /trunk/service-type-database/Makefile.am (revision 1537)
@@ -21,4 +21,5 @@
 
 pkgdata_DATA=service-types
+pkglib_DATA=
 
 if HAVE_PYTHON
@@ -26,5 +27,5 @@
 
 noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db
+pkglib_DATA+=service-types.db
 
 build-db: build-db.in
@@ -43,5 +44,5 @@
 
 noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db.pag service-types.db.dir
+pkglib_DATA+=service-types.db.pag service-types.db.dir
 
 build-db: build-db.in
Index: /trunk/avahi-utils/Makefile.am
===================================================================
--- /trunk/avahi-utils/Makefile.am (revision 1263)
+++ /trunk/avahi-utils/Makefile.am (revision 1537)
@@ -33,5 +33,5 @@
 if HAVE_GDBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 avahi_browse_LDADD += -lgdbm
 endif
@@ -39,5 +39,5 @@
 if HAVE_DBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
Index: /trunk/avahi-ui/Makefile.am
===================================================================
--- /trunk/avahi-ui/Makefile.am (revision 1457)
+++ /trunk/avahi-ui/Makefile.am (revision 1537)
@@ -48,5 +48,5 @@
 if HAVE_GDBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 libavahi_ui_la_LIBADD += -lgdbm
 endif
@@ -54,5 +54,5 @@
 if HAVE_DBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/F-8/avahi.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- avahi.spec	25 Sep 2007 00:20:49 -0000	1.96
+++ avahi.spec	17 Dec 2007 19:16:57 -0000	1.97
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -30,6 +30,7 @@
 BuildRequires:  python
 BuildRequires:  gdbm-devel
 BuildRequires:  pygtk2
+BuildRequires:  automake libtool
 %if %{WITH_MONO}
 BuildRequires:  mono-devel >= 1.1.13
 %endif
@@ -41,6 +42,7 @@
 Patch3:     avahi-0.6.21-initscript.patch
 Patch4:     avahi-0.6.21-libdns_sd-fix.patch
 Patch5:	    avahi-0.6.21-resolv-conf.patch
+Patch6:     avahi-0.6.21-multiarch.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -227,9 +229,12 @@
 %patch3 -p0 -b .initscript
 %patch4 -p0 -b .dns_sd
 %patch5 -p2 -b .resolv_conf
+%patch6 -p2 -b .multiarch
 
 %build
 
+aclocal -I common
+automake
 %configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi --with-autoipd-user=avahi-autoipd --with-autoipd-group=avahi-autoipd \
 %if %{WITH_COMPAT_DNSSD}
         --enable-compat-libdns_sd \
@@ -370,6 +375,7 @@
 %attr(0755,root,root) %{_libdir}/libavahi-core.so.*
 %attr(0755,root,root) %{_libdir}/libavahi-client.so.*
 %{_datadir}/avahi
+%{_libdir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %{_mandir}/man5/*
 %{_mandir}/man8/avahi-daemon.*
@@ -487,6 +493,9 @@
 %endif
 
 %changelog
+* Mon Dec 17 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.6.21-7
+- resolves #274731: fix service-types.db multiarch conflict (pulled from upstream SVN r1525)
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter at redhat.com> - 0.6.21-6
 - resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)
 


--- avahi-0.6.11-align.patch DELETED ---


--- avahi-0.6.11-use-ipv6-yes.patch DELETED ---


--- avahi-0.6.15-initscript.patch DELETED ---


--- avahi-0.6.15-netdev.patch DELETED ---


--- avahi-0.6.17-exitcode.patch DELETED ---


--- avahi-0.6.20-arp-packet-fix.patch DELETED ---


--- avahi-0.6.20-cleanup-dns-compression-table.patch DELETED ---


--- avahi-0.6.20-make-known-answers-not-conflict.patch DELETED ---


--- avahi-0.6.9-bz189427.patch DELETED ---