From a12a04c8172c7d6689cd7b56ab78be90db23693a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Dec 18 2007 09:09:54 +0000
Subject: Missing bits to the previous fix


---

diff --git a/avahi-0.6.21-multiarch.patch b/avahi-0.6.21-multiarch.patch
index 73d1ee8..3c61efd 100644
--- a/avahi-0.6.21-multiarch.patch
+++ b/avahi-0.6.21-multiarch.patch
@@ -58,3 +58,32 @@ Index: /trunk/avahi-ui/Makefile.am
 +libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
  endif
  
+Index: /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in
+===================================================================
+--- /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in (revision 1245)
++++ /trunk/avahi-python/avahi/ServiceTypeDatabase.py.in (revision 1540)
+@@ -28,5 +28,5 @@
+ class ServiceTypeDatabase:
+ 
+-    def __init__(self, filename = "@pkgdatadir@/service-types.db"):
++    def __init__(self, filename = "@pkglibdir@/service-types.db"):
+ 
+         self.db = @DBM@.open(filename, "r")
+Index: /trunk/avahi-python/avahi/Makefile.am
+===================================================================
+--- /trunk/avahi-python/avahi/Makefile.am (revision 1539)
++++ /trunk/avahi-python/avahi/Makefile.am (revision 1540)
+@@ -34,5 +34,5 @@
+ 		-e 's,@CHECK_KEY\@,while key is not None:,g' \
+ 		-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
+-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
++		-e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
+ 	chmod +x $@
+ endif
+@@ -47,5 +47,5 @@
+ 		-e 's,@CHECK_KEY\@,for key in keys:,g' \
+ 		-e 's,@NEXT_KEY\@,,g' \
+-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
++		-e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
+ 	chmod +x $@
+ endif
diff --git a/avahi.spec b/avahi.spec
index 994e98b..1ac120e 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -493,8 +493,11 @@ fi
 %endif
 
 %changelog
+* Tue Dec 18 2007 Lubomir Kundrak <lkundrak@redhat.com> - 0.6.21-8
+- resolves #274731: add what was missing from previous change (pulled from upstream SVN r1540)
+
 * Mon Dec 17 2007 Lubomir Kundrak <lkundrak@redhat.com> - 0.6.21-7
-- resolves #274731: fix service-types.db multiarch conflict (pulled from upstream SVN r1525)
+- resolves #274731: fix service-types.db multiarch conflict (pulled from upstream SVN r1537)
 
 * Tue Sep 25 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-6
 - resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)