rpms/avahi/F-8 avahi-0.6.21-multiarch.patch, 1.1, 1.2 avahi.spec, 1.97, 1.98

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	avahi-0.6.21-multiarch.patch avahi.spec 
Log Message:
Missing bits to the previous fix


avahi-0.6.21-multiarch.patch:

Index: avahi-0.6.21-multiarch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/F-8/avahi-0.6.21-multiarch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.21-multiarch.patch	17 Dec 2007 19:16:57 -0000	1.1
+++ avahi-0.6.21-multiarch.patch	18 Dec 2007 09:09:54 -0000	1.2
@@ -58,3 +58,32 @@
 +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 at .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, at CHECK_KEY\@,while key is not None:,g' \
+ 		-e 's, at NEXT_KEY\@,key = self.db.nextkey(key),g' \
+-		-e 's, at pkgdatadir\@,$(pkgdatadir),g' $< > $@
++		-e 's, at pkglibdir\@,$(pkglibdir),g' $< > $@
+ 	chmod +x $@
+ endif
+@@ -47,5 +47,5 @@
+ 		-e 's, at CHECK_KEY\@,for key in keys:,g' \
+ 		-e 's, at NEXT_KEY\@,,g' \
+-		-e 's, at pkgdatadir\@,$(pkgdatadir),g' $< > $@
++		-e 's, at pkglibdir\@,$(pkglibdir),g' $< > $@
+ 	chmod +x $@
+ endif


Index: avahi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avahi/F-8/avahi.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- avahi.spec	17 Dec 2007 19:16:57 -0000	1.97
+++ avahi.spec	18 Dec 2007 09:09:54 -0000	1.98
@@ -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 @@
 %endif
 
 %changelog
+* Tue Dec 18 2007 Lubomir Kundrak <lkundrak at 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 at 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 at redhat.com> - 0.6.21-6
 - resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)