From 4d02ab209fe156ea7a542be803e2eecc23981af9d6072c0e2a9543e7a4765c29 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Sep 2021 10:06:11 +0000 Subject: [PATCH 1/2] Accepting request 919909 from home:sbrabec:branches:tuu-goodbye - Remove obsolete translation-update-upstream support (jsc#SLE-21105). OBS-URL: https://build.opensuse.org/request/show/919909 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=190 --- avahi-glib2.changes | 6 ++++++ avahi-glib2.spec | 3 +-- avahi-mono.changes | 6 ++++++ avahi-mono.spec | 3 +-- avahi-qt5.changes | 6 ++++++ avahi-qt5.spec | 3 +-- avahi.changes | 6 ++++++ avahi.spec | 3 +-- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/avahi-glib2.changes b/avahi-glib2.changes index 5f1efe2..ffe912e 100644 --- a/avahi-glib2.changes +++ b/avahi-glib2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec + +- Remove obsolete translation-update-upstream support + (jsc#SLE-21105). + ------------------------------------------------------------------- Wed Jan 13 00:38:53 UTC 2021 - Benjamin Greiner diff --git a/avahi-glib2.spec b/avahi-glib2.spec index aad3a94..a415c51 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -90,7 +90,6 @@ BuildRequires: libexpat-devel # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%{build_glib2} && !%{build_mono} && !%{build_qt5} # Create split spec files only when building per partes: @@ -410,6 +409,7 @@ Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. + # This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk @@ -516,7 +516,6 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in cp -a %{SOURCE12} service-type-database/build-db -translation-update-upstream %patch0 %patch1 -p1 %patch4 diff --git a/avahi-mono.changes b/avahi-mono.changes index 2441129..a7108b2 100644 --- a/avahi-mono.changes +++ b/avahi-mono.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec + +- Remove obsolete translation-update-upstream support + (jsc#SLE-21105). + ------------------------------------------------------------------- Mon Aug 31 10:21:27 UTC 2020 - Antonio Larrosa diff --git a/avahi-mono.spec b/avahi-mono.spec index eba00f7..11f71dc 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -90,7 +90,6 @@ BuildRequires: libexpat-devel # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%{build_glib2} && !%{build_mono} && !%{build_qt5} # Create split spec files only when building per partes: @@ -409,6 +408,7 @@ Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. + # This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk @@ -515,7 +515,6 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in cp -a %{SOURCE12} service-type-database/build-db -translation-update-upstream %patch0 %patch1 -p1 %patch4 diff --git a/avahi-qt5.changes b/avahi-qt5.changes index dfd3e15..7549db1 100644 --- a/avahi-qt5.changes +++ b/avahi-qt5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec + +- Remove obsolete translation-update-upstream support + (jsc#SLE-21105). + ------------------------------------------------------------------- Mon Aug 31 12:14:11 UTC 2020 - Antonio Larrosa diff --git a/avahi-qt5.spec b/avahi-qt5.spec index c2dc348..8c7a906 100644 --- a/avahi-qt5.spec +++ b/avahi-qt5.spec @@ -90,7 +90,6 @@ BuildRequires: libexpat-devel # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%{build_glib2} && !%{build_mono} && !%{build_qt5} # Create split spec files only when building per partes: @@ -410,6 +409,7 @@ Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. + # This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk @@ -516,7 +516,6 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in cp -a %{SOURCE12} service-type-database/build-db -translation-update-upstream %patch0 %patch1 -p1 %patch4 diff --git a/avahi.changes b/avahi.changes index 20322fc..74920b9 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec + +- Remove obsolete translation-update-upstream support + (jsc#SLE-21105). + ------------------------------------------------------------------- Mon Aug 2 08:32:59 UTC 2021 - Yifan Jiang diff --git a/avahi.spec b/avahi.spec index c735757..7c5b57f 100644 --- a/avahi.spec +++ b/avahi.spec @@ -92,7 +92,6 @@ BuildRequires: libexpat-devel # libtool is needed to build all variants: bootstrap is unconditional in the build section BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: translation-update-upstream # FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10). %if !%{build_glib2} && !%{build_mono} && !%{build_qt5} # Create split spec files only when building per partes: @@ -412,6 +411,7 @@ Avahi is an implementation of the DNS Service Discovery and Multicast DNS specifications for Zeroconf Computing. + # This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk @@ -511,7 +511,6 @@ sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE10} >avahi-autoipd/avahi-autoipd.if-up sed "s:@sbindir@:%{_sbindir}:g" <%{SOURCE11} >avahi-autoipd/avahi-autoipd.if-down sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in cp -a %{SOURCE12} service-type-database/build-db -translation-update-upstream %patch0 %patch1 -p1 %patch4 From d3731f82ca80f5cad1f18c7f1cc4ba5d75d700f6080386be648d7d5201055f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 19 Oct 2021 12:04:01 +0000 Subject: [PATCH 2/2] Accepting request 926163 from GNOME:Next - Add rpmlintrc: Filter shlib-policy-name-error for libdns_sd (boo#1191750). The error should soon get a 10000 badness rating, which would make the package faile OBS-URL: https://build.opensuse.org/request/show/926163 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=191 --- avahi-glib2.spec | 4 +++- avahi-mono.spec | 4 +++- avahi-qt5.spec | 4 +++- avahi-rpmlintrc | 1 + avahi.changes | 6 ++++++ avahi.spec | 5 ++++- 6 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 avahi-rpmlintrc diff --git a/avahi-glib2.spec b/avahi-glib2.spec index a415c51..45f7711 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -410,8 +410,10 @@ DNS specifications for Zeroconf Computing. -# This is the avahi-discover command, only provided for the primary python3 flavor + + +# This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi-mono.spec b/avahi-mono.spec index 11f71dc..f98b81e 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -409,8 +409,10 @@ DNS specifications for Zeroconf Computing. -# This is the avahi-discover command, only provided for the primary python3 flavor + + +# This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi-qt5.spec b/avahi-qt5.spec index 8c7a906..a9bbc06 100644 --- a/avahi-qt5.spec +++ b/avahi-qt5.spec @@ -410,8 +410,10 @@ DNS specifications for Zeroconf Computing. -# This is the avahi-discover command, only provided for the primary python3 flavor + + +# This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python diff --git a/avahi-rpmlintrc b/avahi-rpmlintrc new file mode 100644 index 0000000..1e94fa3 --- /dev/null +++ b/avahi-rpmlintrc @@ -0,0 +1 @@ +addFilter("shlib-policy-name-error SONAME: libdns_sd.so.1"); diff --git a/avahi.changes b/avahi.changes index 74920b9..3ccc8a8 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 19 07:32:49 UTC 2021 - Dominique Leuenberger + +- Add rpmlintrc: Filter shlib-policy-name-error for libdns_sd + (boo#1191750). + ------------------------------------------------------------------- Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec diff --git a/avahi.spec b/avahi.spec index 7c5b57f..bb07294 100644 --- a/avahi.spec +++ b/avahi.spec @@ -69,6 +69,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 @@ -412,8 +413,10 @@ DNS specifications for Zeroconf Computing. -# This is the avahi-discover command, only provided for the primary python3 flavor + + +# This is the avahi-discover command, only provided for the primary python3 flavor %package -n python3-avahi-gtk Summary: A set of Avahi utilities written in Python Using python-gtk Group: Development/Languages/Python