Attachment 144030 Details for Bug 185692 – Revert changing the mono directory to /usr/lib

[patch] Revert changing the mono directory to /usr/lib

avahi-libdir.diff (text/plain), 1.56 KB, created by Toshio Kuratomi on 2006-12-19 18:49:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Kuratomi

Created: 2006-12-19 18:49:39 UTC

Size: 1.56 KB

patch

obsolete

>? avahi-libdir.diff
>Index: avahi.spec
>===================================================================
>RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
>retrieving revision 1.75
>diff -u -r1.75 avahi.spec
>--- avahi.spec	7 Dec 2006 19:24:30 -0000	1.75
>+++ avahi.spec	19 Dec 2006 18:25:41 -0000
>@@ -40,7 +40,6 @@
> Patch6:     avahi-0.6.3-MONO_SHARED_DIR.patch
> Patch13: 	avahi-0.6.9-bz185972.patch
> Patch14:	avahi-0.6.9-bz189427.patch
>-Patch15:	avahi-0.6.9-mono-libdir.patch
> Patch17:	avahi-0.6.11-use-ipv6-yes.patch
> Patch20: 	avahi-0.6.15-initscript.patch
> Patch21: 	avahi-0.6.11-align.patch
>@@ -168,7 +167,6 @@
> %endif
> %patch13 -p1 -b .bz185972
> %patch14 -p1 -b .bz189427
>-%patch15 -p1 -b .mono-libdir
> %patch17 -p1 -b .use-ipv6-yes
> %patch20 -p1 -b .initscript
> %patch21 -p1 -b .align
>@@ -224,10 +222,6 @@
> 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
> # fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
> %if %{WITH_COMPAT_HOWL}
> ln -s avahi-compat-howl.pc  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc 
>@@ -353,8 +347,8 @@
> %if %{WITH_MONO}
> %files sharp
> %defattr(0644, root, root, 0755)
>-%{_prefix}/lib/mono/avahi-sharp
>-%{_prefix}/lib/mono/gac/avahi-sharp
>+%{_libdir}/mono/avahi-sharp
>+%{_libdir}/mono/gac/avahi-sharp
> %{_libdir}/pkgconfig/avahi-sharp.pc
> %endif
>

Actions: View | Diff

Attachments on bug 185692: 144030