rpms/avahi/devel avahi.spec,1.47,1.48

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24305

Modified Files:
	avahi.spec 
Log Message:
fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir}


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- avahi.spec	16 Mar 2006 22:52:58 -0000	1.47
+++ avahi.spec	16 Mar 2006 23:09:37 -0000	1.48
@@ -186,6 +186,11 @@
 # Make /etc/avahi/etc/localtime owned by avahi:
 mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
 touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
+#
+# Fix avahi-sharp default installation into /usr/lib64 on x86_64:
+if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e  $RPM_BUILD_ROOT/%{_libdir}/mono ]; then
+   mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; 
+fi
 :;
 
 %clean
@@ -310,12 +315,12 @@
 %defattr(0644, root, root, 0755)
 %{_prefix}/lib/mono/avahi-sharp
 %{_prefix}/lib/mono/gac/avahi-sharp
-%{_prefix}/lib/pkgconfig/avahi-sharp.pc
+%{_libdir}/lib/pkgconfig/avahi-sharp.pc
 %endif
 
 %changelog
 * Thu Mar 16 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-6
-- Fix bug 185692: install avahi-sharp into %{prefix}/lib, not %{_libdir}
+- Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir}
 
 * Thu Mar 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-4
 - fix scriptlet error introduced by last fix: