Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package avahi for openSUSE:Factory checked
in at 2022-02-22 21:17:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/avahi (Old)
and /work/SRC/openSUSE:Factory/.avahi.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avahi"
Tue Feb 22 21:17:51 2022 rev:149 rq:956509 version:0.8
Changes:
--------
avahi-qt5.changes: same change
--- /work/SRC/openSUSE:Factory/avahi/avahi.changes 2022-02-18
23:02:59.437412619 +0100
+++ /work/SRC/openSUSE:Factory/.avahi.new.1958/avahi.changes 2022-02-22
21:18:10.590286067 +0100
@@ -1,0 +2,6 @@
+Thu Feb 17 00:03:22 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- remove avahi-mono* subspecfiles, they are no longer required
+ by anything. this makes the spec file slightly more readable.
+
+-------------------------------------------------------------------
Old:
----
avahi-mono.changes
avahi-mono.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.FCA3Nd/_old 2022-02-22 21:18:11.934286314 +0100
+++ /var/tmp/diff_new_pack.FCA3Nd/_new 2022-02-22 21:18:11.938286315 +0100
@@ -24,7 +24,6 @@
%define build_core 0
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
%define build_glib2 1
-%define build_mono 0
%define build_qt5 0
%define avahi_client_sover 3
%define avahi_common_sover 3
@@ -105,7 +104,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xmltoman
-%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
+%if !%{build_glib2} && !%{build_qt5}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@@ -135,17 +134,6 @@
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
-%if %{build_mono}
-BuildRequires: gtk-sharp2
-BuildRequires: libavahi-glib-devel = %{version}
-BuildRequires: mono-devel
-BuildRequires: monodoc-core
-# Please copy this line to avahi-mono definition below for build all-in-once:
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-%endif
%if %{build_qt5}
BuildRequires: dbus-1-devel
BuildRequires: libavahi-devel = %{version}
@@ -419,17 +407,6 @@
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
@@ -477,28 +454,6 @@
DNS specifications for Zeroconf Computing.
%if %{build_core}
-%if %{build_mono}
-%package -n avahi-mono
-Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: Development/Languages/Mono
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-
-%description -n avahi-mono
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
-%endif
%lang_package
%endif
@@ -553,15 +508,11 @@
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
# It allows to build only the binding subpackage.
-%if %{build_mono}
-sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g'
*/Makefile.am
-%else
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
' */Makefile.am
%endif
-%endif
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
cat %{SOURCE4} >>acinclude.m4
fi
@@ -596,19 +547,12 @@
--disable-glib\
--disable-gobject\
--disable-pygobject\
-%if ! %{build_mono}
--disable-gtk\
-%endif
--disable-gtk3\
%endif
--disable-qt3\
--disable-qt4\
-%if %{build_mono}
- --enable-mono\
- --disable-gtk\
-%else
--disable-mono\
-%endif
%if %{build_qt5}
--enable-qt5\
%else
@@ -631,11 +575,6 @@
cd ..
done
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_build
-cd ../avahi-ui-sharp
-%endif
%if %{build_core}
%{python_expand # build for every python flavor
cd avahi-python-%{$python_bin_suffix}
@@ -654,11 +593,6 @@
done
cd -
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_install
-cd ../avahi-ui-sharp
-%endif
%if %{build_qt5} && !%{build_core}
cd avahi-qt
%endif
@@ -743,12 +677,6 @@
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
rmdir %{buildroot}/%{_datadir}/avahi
-%else
-%if %{build_mono}
-%ifnarch ppc64 ppc64le s390x
-strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
-%endif
-%endif
%endif
%endif
%if %{build_glib2}
@@ -1012,23 +940,6 @@
%{_datadir}/gir-1.0/*.gir
%endif
-%if %{build_mono}
-%if %{build_core}
-%files -n avahi-mono
-%else
-
-%files
-%endif
-%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
-
%if %{build_qt5}
%files -n libavahi-qt5-%{avahi_qt5_sover}
%{_libdir}/libavahi-qt5.so.*
++++++ avahi-qt5.spec ++++++
--- /var/tmp/diff_new_pack.FCA3Nd/_old 2022-02-22 21:18:11.962286319 +0100
+++ /var/tmp/diff_new_pack.FCA3Nd/_new 2022-02-22 21:18:11.966286321 +0100
@@ -24,7 +24,6 @@
%define build_core 0
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
%define build_glib2 0
-%define build_mono 0
%define build_qt5 1
%define avahi_client_sover 3
%define avahi_common_sover 3
@@ -105,7 +104,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xmltoman
-%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
+%if !%{build_glib2} && !%{build_qt5}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@@ -135,17 +134,6 @@
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
-%if %{build_mono}
-BuildRequires: gtk-sharp2
-BuildRequires: libavahi-glib-devel = %{version}
-BuildRequires: mono-devel
-BuildRequires: monodoc-core
-# Please copy this line to avahi-mono definition below for build all-in-once:
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-%endif
%if %{build_qt5}
BuildRequires: dbus-1-devel
BuildRequires: libavahi-devel = %{version}
@@ -419,17 +407,6 @@
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
@@ -477,28 +454,6 @@
DNS specifications for Zeroconf Computing.
%if %{build_core}
-%if %{build_mono}
-%package -n avahi-mono
-Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and
Bonjour
-Group: Development/Languages/Mono
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-
-%description -n avahi-mono
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
-%endif
%lang_package
%endif
@@ -553,15 +508,11 @@
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
# It allows to build only the binding subpackage.
-%if %{build_mono}
-sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g'
*/Makefile.am
-%else
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
' */Makefile.am
%endif
-%endif
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
cat %{SOURCE4} >>acinclude.m4
fi
@@ -596,19 +547,12 @@
--disable-glib\
--disable-gobject\
--disable-pygobject\
-%if ! %{build_mono}
--disable-gtk\
-%endif
--disable-gtk3\
%endif
--disable-qt3\
--disable-qt4\
-%if %{build_mono}
- --enable-mono\
- --disable-gtk\
-%else
--disable-mono\
-%endif
%if %{build_qt5}
--enable-qt5\
%else
@@ -631,11 +575,6 @@
cd ..
done
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_build
-cd ../avahi-ui-sharp
-%endif
%if %{build_core}
%{python_expand # build for every python flavor
cd avahi-python-%{$python_bin_suffix}
@@ -654,11 +593,6 @@
done
cd -
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_install
-cd ../avahi-ui-sharp
-%endif
%if %{build_qt5} && !%{build_core}
cd avahi-qt
%endif
@@ -743,12 +677,6 @@
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
rmdir %{buildroot}/%{_datadir}/avahi
-%else
-%if %{build_mono}
-%ifnarch ppc64 ppc64le s390x
-strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
-%endif
-%endif
%endif
%endif
%if %{build_glib2}
@@ -1012,23 +940,6 @@
%{_datadir}/gir-1.0/*.gir
%endif
-%if %{build_mono}
-%if %{build_core}
-%files -n avahi-mono
-%else
-
-%files
-%endif
-%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
-
%if %{build_qt5}
%files -n libavahi-qt5-%{avahi_qt5_sover}
%{_libdir}/libavahi-qt5.so.*
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.FCA3Nd/_old 2022-02-22 21:18:11.990286325 +0100
+++ /var/tmp/diff_new_pack.FCA3Nd/_new 2022-02-22 21:18:11.994286325 +0100
@@ -26,7 +26,6 @@
%define build_core 1
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
%define build_glib2 0
-%define build_mono 0
%define build_qt5 0
%define avahi_client_sover 3
%define avahi_common_sover 3
@@ -107,7 +106,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xmltoman
-%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
+%if !%{build_glib2} && !%{build_qt5}
# Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif
@@ -137,17 +136,6 @@
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(pygobject-3.0)
%endif
-%if %{build_mono}
-BuildRequires: gtk-sharp2
-BuildRequires: libavahi-glib-devel = %{version}
-BuildRequires: mono-devel
-BuildRequires: monodoc-core
-# Please copy this line to avahi-mono definition below for build all-in-once:
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-%endif
%if %{build_qt5}
BuildRequires: dbus-1-devel
BuildRequires: libavahi-devel = %{version}
@@ -421,17 +409,6 @@
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
@@ -479,21 +456,6 @@
DNS specifications for Zeroconf Computing.
%if %{build_core}
-%if %{build_mono}
-%package -n avahi-mono
-Summary: Mono Bindings for avahi, the D-Bus Service for Zeroconf and
Bonjour
-Group: Development/Languages/Mono
-Requires: gtk-sharp2
-Requires: libavahi-client%{avahi_client_sover} >= %{version}
-Requires: libavahi-common%{avahi_common_sover} >= %{version}
-Requires: libavahi-glib%{avahi_glib_sover} >= %{version}
-
-%description -n avahi-mono
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing.
-
-%endif
%lang_package
%endif
@@ -548,15 +510,11 @@
# Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la.
# It allows to build only the binding subpackage.
-%if %{build_mono}
-sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g'
*/Makefile.am
-%else
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
' */Makefile.am
%endif
-%endif
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
cat %{SOURCE4} >>acinclude.m4
fi
@@ -591,19 +549,12 @@
--disable-glib\
--disable-gobject\
--disable-pygobject\
-%if ! %{build_mono}
--disable-gtk\
-%endif
--disable-gtk3\
%endif
--disable-qt3\
--disable-qt4\
-%if %{build_mono}
- --enable-mono\
- --disable-gtk\
-%else
--disable-mono\
-%endif
%if %{build_qt5}
--enable-qt5\
%else
@@ -626,11 +577,6 @@
cd ..
done
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_build
-cd ../avahi-ui-sharp
-%endif
%if %{build_core}
%{python_expand # build for every python flavor
cd avahi-python-%{$python_bin_suffix}
@@ -649,11 +595,6 @@
done
cd -
%endif
-%if %{build_mono} && !%{build_core}
-cd avahi-sharp
-%make_install
-cd ../avahi-ui-sharp
-%endif
%if %{build_qt5} && !%{build_core}
cd avahi-qt
%endif
@@ -738,12 +679,6 @@
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
rmdir %{buildroot}/%{_datadir}/avahi
-%else
-%if %{build_mono}
-%ifnarch ppc64 ppc64le s390x
-strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
-%endif
-%endif
%endif
%endif
%if %{build_glib2}
@@ -1007,23 +942,6 @@
%{_datadir}/gir-1.0/*.gir
%endif
-%if %{build_mono}
-%if %{build_core}
-%files -n avahi-mono
-%else
-
-%files
-%endif
-%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
-
%if %{build_qt5}
%files -n libavahi-qt5-%{avahi_qt5_sover}
%{_libdir}/libavahi-qt5.so.*
++++++ avahi_spec-prepare.sh ++++++
--- /var/tmp/diff_new_pack.FCA3Nd/_old 2022-02-22 21:18:12.198286363 +0100
+++ /var/tmp/diff_new_pack.FCA3Nd/_new 2022-02-22 21:18:12.202286364 +0100
@@ -13,21 +13,6 @@
exit
fi
-# Edit file to fit -mono build needs:
-sed '
- s/spec file for package avahi/spec file for package avahi-mono/;
- s/build_core\ 1/build_core 0/;
- s/build_mono\ 0/build_mono 1/;
- s/^.ame:.*/&-mono/;
- # No more needed.
- #s/^..hangelog.*/& mono/;
- /^# WARNING: After editing/,/^# to update spec files/d
- /^%define[[:space:]]*_name/i \
-# Do not edit this auto generated file! Edit avahi.spec.
-' <$1/$ORIG_SPEC.spec >$1/$ORIG_SPEC-mono.spec.new
-perl $1/update_spec.pl $1/$ORIG_SPEC-mono.spec.new attributes >
$1/$ORIG_SPEC-mono.spec
-rm $1/$ORIG_SPEC-mono.spec.new
-
# Edit file to fit -glib2 build needs:
sed '
s/spec file for package avahi/spec file for package avahi-glib2/;
@@ -60,6 +45,5 @@
# Not wanted for avahi:
#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-glib2.changes
-#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-mono.changes
#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-qt5.changes
