From 198a2ed409df734e49cccd40ad0cb47b8ccf4d4234ae3d5dd20eb299d083d4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 10 Dec 2021 18:50:48 +0000 Subject: [PATCH] Accepting request 938977 from home:yfjiang:branches:GNOME:Factory - Disable monodoc on ppc64, ppc64le and s390x, because the mdoc.exe is completely not shipped with monocore-doc on them (bsc#1192212). OBS-URL: https://build.opensuse.org/request/show/938977 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=193 --- avahi-glib2.spec | 8 ++++++++ avahi-mono.changes | 6 ++++++ avahi-mono.spec | 8 ++++++++ avahi-qt5.spec | 8 ++++++++ avahi.spec | 7 +++++++ 5 files changed, 37 insertions(+) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 2e70185..dc1b025 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -67,6 +67,7 @@ Source12: https://raw.githubusercontent.com/lathiat/avahi/master/service-t Source100: attributes Source101: update_spec.pl Source102: baselibs.conf +Source103: avahi-rpmlintrc # PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz @@ -591,6 +592,9 @@ export PYTHON=%{_bindir}/$python --enable-qt5\ %else --disable-qt5\ +%endif +%ifarch ppc64 ppc64le s390x + --disable-monodoc\ %endif --with-avahi-priv-access-group=avahi\ --with-autoipd-user=avahi-autoipd\ @@ -714,12 +718,14 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces rmdir %{buildroot}/%{_datadir}/avahi %else %if %{build_mono} +%ifnarch ppc64 ppc64le s390x %if 0%{?suse_version} >= 1330 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %endif %endif %endif +%endif %if %{build_glib2} %suse_update_desktop_file avahi-discover %suse_update_desktop_file bvnc @@ -993,7 +999,9 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %defattr(-,root,root) %{_libdir}/pkgconfig/avahi-sharp.pc %{_libdir}/pkgconfig/avahi-ui-sharp.pc +%ifnarch ppc64 ppc64le s390x %{_prefix}/lib/monodoc/sources/*.* +%endif %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp %endif diff --git a/avahi-mono.changes b/avahi-mono.changes index 0c09e67..d8a8a29 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 8 02:57:51 UTC 2021 - Yifan Jiang + +- Disable monodoc on ppc64, ppc64le and s390x, because the mdoc.exe + is completely not shipped with monocore-doc on them (bsc#1192212). + ------------------------------------------------------------------- Mon Oct 25 13:20:49 UTC 2021 - Yifan Jiang diff --git a/avahi-mono.spec b/avahi-mono.spec index cba1174..d1323a7 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -67,6 +67,7 @@ Source12: https://raw.githubusercontent.com/lathiat/avahi/master/service-t Source100: attributes Source101: update_spec.pl Source102: baselibs.conf +Source103: avahi-rpmlintrc # PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz @@ -590,6 +591,9 @@ export PYTHON=%{_bindir}/$python --enable-qt5\ %else --disable-qt5\ +%endif +%ifarch ppc64 ppc64le s390x + --disable-monodoc\ %endif --with-avahi-priv-access-group=avahi\ --with-autoipd-user=avahi-autoipd\ @@ -713,12 +717,14 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces rmdir %{buildroot}/%{_datadir}/avahi %else %if %{build_mono} +%ifnarch ppc64 ppc64le s390x %if 0%{?suse_version} >= 1330 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %endif %endif %endif +%endif %if %{build_glib2} %suse_update_desktop_file avahi-discover %suse_update_desktop_file bvnc @@ -992,7 +998,9 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %defattr(-,root,root) %{_libdir}/pkgconfig/avahi-sharp.pc %{_libdir}/pkgconfig/avahi-ui-sharp.pc +%ifnarch ppc64 ppc64le s390x %{_prefix}/lib/monodoc/sources/*.* +%endif %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp %endif diff --git a/avahi-qt5.spec b/avahi-qt5.spec index 4a870c7..435c2f0 100644 --- a/avahi-qt5.spec +++ b/avahi-qt5.spec @@ -67,6 +67,7 @@ Source12: https://raw.githubusercontent.com/lathiat/avahi/master/service-t Source100: attributes Source101: update_spec.pl Source102: baselibs.conf +Source103: avahi-rpmlintrc # PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse Patch0: avahi-gacdir.patch # PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 Avahi#365 -- sbrabec@suse.cz @@ -591,6 +592,9 @@ export PYTHON=%{_bindir}/$python --enable-qt5\ %else --disable-qt5\ +%endif +%ifarch ppc64 ppc64le s390x + --disable-monodoc\ %endif --with-avahi-priv-access-group=avahi\ --with-autoipd-user=avahi-autoipd\ @@ -714,12 +718,14 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces rmdir %{buildroot}/%{_datadir}/avahi %else %if %{build_mono} +%ifnarch ppc64 ppc64le s390x %if 0%{?suse_version} >= 1330 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %endif %endif %endif +%endif %if %{build_glib2} %suse_update_desktop_file avahi-discover %suse_update_desktop_file bvnc @@ -993,7 +999,9 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %defattr(-,root,root) %{_libdir}/pkgconfig/avahi-sharp.pc %{_libdir}/pkgconfig/avahi-ui-sharp.pc +%ifnarch ppc64 ppc64le s390x %{_prefix}/lib/monodoc/sources/*.* +%endif %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp %endif diff --git a/avahi.spec b/avahi.spec index f6db170..c722c21 100644 --- a/avahi.spec +++ b/avahi.spec @@ -587,6 +587,9 @@ export PYTHON=%{_bindir}/$python --enable-qt5\ %else --disable-qt5\ +%endif +%ifarch ppc64 ppc64le s390x + --disable-monodoc\ %endif --with-avahi-priv-access-group=avahi\ --with-autoipd-user=avahi-autoipd\ @@ -710,12 +713,14 @@ rmdir %{buildroot}/%{_datadir}/avahi/interfaces rmdir %{buildroot}/%{_datadir}/avahi %else %if %{build_mono} +%ifnarch ppc64 ppc64le s390x %if 0%{?suse_version} >= 1330 strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip %endif %endif %endif %endif +%endif %if %{build_glib2} %suse_update_desktop_file avahi-discover %suse_update_desktop_file bvnc @@ -989,7 +994,9 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a %defattr(-,root,root) %{_libdir}/pkgconfig/avahi-sharp.pc %{_libdir}/pkgconfig/avahi-ui-sharp.pc +%ifnarch ppc64 ppc64le s390x %{_prefix}/lib/monodoc/sources/*.* +%endif %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp %endif