Accepting request 955708 from home:dirkmueller:Factory
- remove avahi-mono* subspecfiles, they are no longer required by anything. this makes the spec file slightly more readable. OBS-URL: https://build.opensuse.org/request/show/955708 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=198
This commit is contained in:
parent
96533482a5
commit
c42d63779a
@ -24,7 +24,6 @@
|
|||||||
%define build_core 0
|
%define build_core 0
|
||||||
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
||||||
%define build_glib2 1
|
%define build_glib2 1
|
||||||
%define build_mono 0
|
|
||||||
%define build_qt5 0
|
%define build_qt5 0
|
||||||
%define avahi_client_sover 3
|
%define avahi_client_sover 3
|
||||||
%define avahi_common_sover 3
|
%define avahi_common_sover 3
|
||||||
@ -105,7 +104,7 @@ BuildRequires: sysuser-tools
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xmltoman
|
BuildRequires: xmltoman
|
||||||
%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
|
%if !%{build_glib2} && !%{build_qt5}
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
%endif
|
%endif
|
||||||
@ -135,17 +134,6 @@ BuildRequires: libavahi-devel = %{version}
|
|||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: pkgconfig(pygobject-3.0)
|
BuildRequires: pkgconfig(pygobject-3.0)
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: libavahi-devel = %{version}
|
BuildRequires: libavahi-devel = %{version}
|
||||||
@ -430,8 +418,8 @@ 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
|
%package -n python3-avahi-gtk
|
||||||
Summary: A set of Avahi utilities written in Python Using python-gtk
|
Summary: A set of Avahi utilities written in Python Using python-gtk
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
@ -477,28 +465,6 @@ Avahi is an implementation of the DNS Service Discovery and Multicast
|
|||||||
DNS specifications for Zeroconf Computing.
|
DNS specifications for Zeroconf Computing.
|
||||||
|
|
||||||
%if %{build_core}
|
%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
|
%lang_package
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -553,15 +519,11 @@ cp -a %{SOURCE12} service-type-database/build-db
|
|||||||
# Replace all .la references from local .la files to installed versions
|
# Replace all .la references from local .la files to installed versions
|
||||||
# with exception of libavahi-glib.la.
|
# with exception of libavahi-glib.la.
|
||||||
# It allows to build only the binding subpackage.
|
# 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
|
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
|
||||||
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
||||||
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
||||||
' */Makefile.am
|
' */Makefile.am
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
||||||
cat %{SOURCE4} >>acinclude.m4
|
cat %{SOURCE4} >>acinclude.m4
|
||||||
fi
|
fi
|
||||||
@ -596,19 +558,12 @@ export PYTHON=%{_bindir}/$python
|
|||||||
--disable-glib\
|
--disable-glib\
|
||||||
--disable-gobject\
|
--disable-gobject\
|
||||||
--disable-pygobject\
|
--disable-pygobject\
|
||||||
%if ! %{build_mono}
|
|
||||||
--disable-gtk\
|
--disable-gtk\
|
||||||
%endif
|
|
||||||
--disable-gtk3\
|
--disable-gtk3\
|
||||||
%endif
|
%endif
|
||||||
--disable-qt3\
|
--disable-qt3\
|
||||||
--disable-qt4\
|
--disable-qt4\
|
||||||
%if %{build_mono}
|
|
||||||
--enable-mono\
|
|
||||||
--disable-gtk\
|
|
||||||
%else
|
|
||||||
--disable-mono\
|
--disable-mono\
|
||||||
%endif
|
|
||||||
%if %{build_qt5}
|
%if %{build_qt5}
|
||||||
--enable-qt5\
|
--enable-qt5\
|
||||||
%else
|
%else
|
||||||
@ -631,11 +586,6 @@ cd $DIR
|
|||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_build
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_core}
|
%if %{build_core}
|
||||||
%{python_expand # build for every python flavor
|
%{python_expand # build for every python flavor
|
||||||
cd avahi-python-%{$python_bin_suffix}
|
cd avahi-python-%{$python_bin_suffix}
|
||||||
@ -654,11 +604,6 @@ cd ..
|
|||||||
done
|
done
|
||||||
cd -
|
cd -
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_install
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_qt5} && !%{build_core}
|
%if %{build_qt5} && !%{build_core}
|
||||||
cd avahi-qt
|
cd avahi-qt
|
||||||
%endif
|
%endif
|
||||||
@ -743,12 +688,6 @@ rm %{buildroot}/%{_mandir}/man8/avahi-dnsconfd.action.8*
|
|||||||
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi
|
rmdir %{buildroot}/%{_datadir}/avahi
|
||||||
%else
|
|
||||||
%if %{build_mono}
|
|
||||||
%ifnarch ppc64 ppc64le s390x
|
|
||||||
strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if %{build_glib2}
|
%if %{build_glib2}
|
||||||
@ -1012,23 +951,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a
|
|||||||
%{_datadir}/gir-1.0/*.gir
|
%{_datadir}/gir-1.0/*.gir
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
||||||
%{_libdir}/libavahi-qt5.so.*
|
%{_libdir}/libavahi-qt5.so.*
|
||||||
|
@ -1,130 +0,0 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Wed Dec 8 02:57:51 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
|
|
||||||
|
|
||||||
- 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 <yfjiang@suse.com>
|
|
||||||
|
|
||||||
- Change %python38_version_nodots to %suse_version which is
|
|
||||||
compatible with Leap and SLE. See also:
|
|
||||||
|
|
||||||
https://github.com/openSUSE/python-rpm-macros/issues/107
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Sep 16 01:21:50 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
|
|
||||||
|
|
||||||
- Remove obsolete translation-update-upstream support
|
|
||||||
(jsc#SLE-21105).
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 31 10:21:27 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
|
|
||||||
|
|
||||||
- Update to version 0.8
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Aug 6 07:59:00 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
|
||||||
|
|
||||||
- Skip the xargs dance and just use find directly.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Jan 8 10:17:46 UTC 2020 - Martin Liška <mliska@suse.cz>
|
|
||||||
|
|
||||||
- Use %make_build.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 12 17:29:45 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
|
||||||
|
|
||||||
- Drop gtk2-devel and python-gtk-devel BuildRequires: No longer
|
|
||||||
build gtk2 support. Following this, pass --disable-gtk to
|
|
||||||
configure. Drop sub-package libavahi-ui0, no longer built.
|
|
||||||
- Drop long disabled sub-packages libavahi-qt4-1 and
|
|
||||||
libavahi-qt4-devel.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Jul 5 12:22:21 UTC 2019 - matthias.gerstner@suse.com
|
|
||||||
|
|
||||||
- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
|
|
||||||
firewalld, see [1].
|
|
||||||
|
|
||||||
[1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Nov 23 13:37:31 UTC 2017 - rbrown@suse.com
|
|
||||||
|
|
||||||
- Replace references to /var/adm/fillup-templates with new
|
|
||||||
%_fillupdir macro (boo#1069468)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Apr 21 13:49:59 UTC 2017 - bwiedemann@suse.com
|
|
||||||
|
|
||||||
- use strip-nondeterminism to make build fully reproducible
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sat Sep 17 13:52:32 UTC 2011 - jengelh@medozas.de
|
|
||||||
|
|
||||||
- Remove redundant tags/sections from specfile
|
|
||||||
- Use %_smp_mflags for parallel build
|
|
||||||
- Add libavahi-devel to baselibs
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz
|
|
||||||
|
|
||||||
- Added support for translation-update-upstream (FATE#301344).
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Aug 9 12:43:26 CEST 2009 - coolo@novell.com
|
|
||||||
|
|
||||||
- use new python macros
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Sep 1 10:22:46 CEST 2008 - meissner@suse.de
|
|
||||||
|
|
||||||
- Added GCC attribute alloc_size markup for allocator functions
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Jul 18 17:18:20 CEST 2008 - sbrabec@suse.cz
|
|
||||||
|
|
||||||
- Updated to version 0.6.23:
|
|
||||||
* A lot of translation updates
|
|
||||||
* Beef up bnvc quite a bit, including passing a domain to browse
|
|
||||||
in
|
|
||||||
* Increase numer of open files resource limit to 300 so that we
|
|
||||||
can deal with more clients simultaneously.
|
|
||||||
* Rework 'poof' algorithm a bit to reduce traffic load on noisy
|
|
||||||
links.
|
|
||||||
* Build fixes
|
|
||||||
* Minor other updates
|
|
||||||
* Backwards compatible with Avahi 0.6.x with x < 23.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun May 11 11:49:29 CEST 2008 - coolo@suse.de
|
|
||||||
|
|
||||||
- fix rename of xxbit packages
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 11 16:18:47 CET 2008 - sbrabec@suse.cz
|
|
||||||
|
|
||||||
- Fix build failure of avahi-mono.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Oct 11 14:36:43 CEST 2007 - sbrabec@suse.de
|
|
||||||
|
|
||||||
- Updated dependencies.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 6 17:03:54 CEST 2007 - bk@suse.de
|
|
||||||
|
|
||||||
- replace -p /usr/sbin/ldconfig with %{run_ldconfig}
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Jul 30 08:54:27 CEST 2007 - aj@suse.de
|
|
||||||
|
|
||||||
- Add gcc-c++ to BuildRequires.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Jul 16 09:14:26 CEST 2007 - aj@suse.de
|
|
||||||
|
|
||||||
- Create new spec file to avoid build cycle avahi->gnome->mono->avahi.
|
|
||||||
|
|
1042
avahi-mono.spec
1042
avahi-mono.spec
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,6 @@
|
|||||||
%define build_core 0
|
%define build_core 0
|
||||||
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
||||||
%define build_glib2 0
|
%define build_glib2 0
|
||||||
%define build_mono 0
|
|
||||||
%define build_qt5 1
|
%define build_qt5 1
|
||||||
%define avahi_client_sover 3
|
%define avahi_client_sover 3
|
||||||
%define avahi_common_sover 3
|
%define avahi_common_sover 3
|
||||||
@ -105,7 +104,7 @@ BuildRequires: sysuser-tools
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xmltoman
|
BuildRequires: xmltoman
|
||||||
%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
|
%if !%{build_glib2} && !%{build_qt5}
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
%endif
|
%endif
|
||||||
@ -135,17 +134,6 @@ BuildRequires: libavahi-devel = %{version}
|
|||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: pkgconfig(pygobject-3.0)
|
BuildRequires: pkgconfig(pygobject-3.0)
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: libavahi-devel = %{version}
|
BuildRequires: libavahi-devel = %{version}
|
||||||
@ -430,8 +418,8 @@ 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
|
%package -n python3-avahi-gtk
|
||||||
Summary: A set of Avahi utilities written in Python Using python-gtk
|
Summary: A set of Avahi utilities written in Python Using python-gtk
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
@ -477,28 +465,6 @@ Avahi is an implementation of the DNS Service Discovery and Multicast
|
|||||||
DNS specifications for Zeroconf Computing.
|
DNS specifications for Zeroconf Computing.
|
||||||
|
|
||||||
%if %{build_core}
|
%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
|
%lang_package
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -553,15 +519,11 @@ cp -a %{SOURCE12} service-type-database/build-db
|
|||||||
# Replace all .la references from local .la files to installed versions
|
# Replace all .la references from local .la files to installed versions
|
||||||
# with exception of libavahi-glib.la.
|
# with exception of libavahi-glib.la.
|
||||||
# It allows to build only the binding subpackage.
|
# 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
|
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
|
||||||
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
||||||
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
||||||
' */Makefile.am
|
' */Makefile.am
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
||||||
cat %{SOURCE4} >>acinclude.m4
|
cat %{SOURCE4} >>acinclude.m4
|
||||||
fi
|
fi
|
||||||
@ -596,19 +558,12 @@ export PYTHON=%{_bindir}/$python
|
|||||||
--disable-glib\
|
--disable-glib\
|
||||||
--disable-gobject\
|
--disable-gobject\
|
||||||
--disable-pygobject\
|
--disable-pygobject\
|
||||||
%if ! %{build_mono}
|
|
||||||
--disable-gtk\
|
--disable-gtk\
|
||||||
%endif
|
|
||||||
--disable-gtk3\
|
--disable-gtk3\
|
||||||
%endif
|
%endif
|
||||||
--disable-qt3\
|
--disable-qt3\
|
||||||
--disable-qt4\
|
--disable-qt4\
|
||||||
%if %{build_mono}
|
|
||||||
--enable-mono\
|
|
||||||
--disable-gtk\
|
|
||||||
%else
|
|
||||||
--disable-mono\
|
--disable-mono\
|
||||||
%endif
|
|
||||||
%if %{build_qt5}
|
%if %{build_qt5}
|
||||||
--enable-qt5\
|
--enable-qt5\
|
||||||
%else
|
%else
|
||||||
@ -631,11 +586,6 @@ cd $DIR
|
|||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_build
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_core}
|
%if %{build_core}
|
||||||
%{python_expand # build for every python flavor
|
%{python_expand # build for every python flavor
|
||||||
cd avahi-python-%{$python_bin_suffix}
|
cd avahi-python-%{$python_bin_suffix}
|
||||||
@ -654,11 +604,6 @@ cd ..
|
|||||||
done
|
done
|
||||||
cd -
|
cd -
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_install
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_qt5} && !%{build_core}
|
%if %{build_qt5} && !%{build_core}
|
||||||
cd avahi-qt
|
cd avahi-qt
|
||||||
%endif
|
%endif
|
||||||
@ -743,12 +688,6 @@ rm %{buildroot}/%{_mandir}/man8/avahi-dnsconfd.action.8*
|
|||||||
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi
|
rmdir %{buildroot}/%{_datadir}/avahi
|
||||||
%else
|
|
||||||
%if %{build_mono}
|
|
||||||
%ifnarch ppc64 ppc64le s390x
|
|
||||||
strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if %{build_glib2}
|
%if %{build_glib2}
|
||||||
@ -1012,23 +951,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a
|
|||||||
%{_datadir}/gir-1.0/*.gir
|
%{_datadir}/gir-1.0/*.gir
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
||||||
%{_libdir}/libavahi-qt5.so.*
|
%{_libdir}/libavahi-qt5.so.*
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 17 00:03:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- remove avahi-mono* subspecfiles, they are no longer required
|
||||||
|
by anything. this makes the spec file slightly more readable.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Feb 16 18:26:01 UTC 2022 - Michael Gorse <mgorse@suse.com>
|
Wed Feb 16 18:26:01 UTC 2022 - Michael Gorse <mgorse@suse.com>
|
||||||
|
|
||||||
|
75
avahi.spec
75
avahi.spec
@ -26,7 +26,6 @@
|
|||||||
%define build_core 1
|
%define build_core 1
|
||||||
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
# NOTE: build_glib2 also controls build of gobject, gtk3 and pygobject code.
|
||||||
%define build_glib2 0
|
%define build_glib2 0
|
||||||
%define build_mono 0
|
|
||||||
%define build_qt5 0
|
%define build_qt5 0
|
||||||
%define avahi_client_sover 3
|
%define avahi_client_sover 3
|
||||||
%define avahi_common_sover 3
|
%define avahi_common_sover 3
|
||||||
@ -107,7 +106,7 @@ BuildRequires: sysuser-tools
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: xmltoman
|
BuildRequires: xmltoman
|
||||||
%if !%{build_glib2} && !%{build_mono} && !%{build_qt5}
|
%if !%{build_glib2} && !%{build_qt5}
|
||||||
# Create split spec files only when building per partes:
|
# Create split spec files only when building per partes:
|
||||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||||
%endif
|
%endif
|
||||||
@ -137,17 +136,6 @@ BuildRequires: libavahi-devel = %{version}
|
|||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: pkgconfig(pygobject-3.0)
|
BuildRequires: pkgconfig(pygobject-3.0)
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
BuildRequires: libavahi-devel = %{version}
|
BuildRequires: libavahi-devel = %{version}
|
||||||
@ -432,8 +420,8 @@ 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
|
%package -n python3-avahi-gtk
|
||||||
Summary: A set of Avahi utilities written in Python Using python-gtk
|
Summary: A set of Avahi utilities written in Python Using python-gtk
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
@ -479,21 +467,6 @@ Avahi is an implementation of the DNS Service Discovery and Multicast
|
|||||||
DNS specifications for Zeroconf Computing.
|
DNS specifications for Zeroconf Computing.
|
||||||
|
|
||||||
%if %{build_core}
|
%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
|
%lang_package
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -548,15 +521,11 @@ cp -a %{SOURCE12} service-type-database/build-db
|
|||||||
# Replace all .la references from local .la files to installed versions
|
# Replace all .la references from local .la files to installed versions
|
||||||
# with exception of libavahi-glib.la.
|
# with exception of libavahi-glib.la.
|
||||||
# It allows to build only the binding subpackage.
|
# 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
|
sed -i 's:libavahi-glib\.la:@@SKIP LIBAVAHI GLIB@@:g
|
||||||
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
s:\(\.\.\|\$(top_builddir)\)/[^/]*/\(lib[^ ]*\.la\):%{_libdir}/\2:g
|
||||||
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
s:@@SKIP LIBAVAHI GLIB@@:libavahi-glib.la:g
|
||||||
' */Makefile.am
|
' */Makefile.am
|
||||||
%endif
|
%endif
|
||||||
%endif
|
|
||||||
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
if ! test -f %{_datadir}/aclocal/glib-gettext.m4 ; then
|
||||||
cat %{SOURCE4} >>acinclude.m4
|
cat %{SOURCE4} >>acinclude.m4
|
||||||
fi
|
fi
|
||||||
@ -591,19 +560,12 @@ export PYTHON=%{_bindir}/$python
|
|||||||
--disable-glib\
|
--disable-glib\
|
||||||
--disable-gobject\
|
--disable-gobject\
|
||||||
--disable-pygobject\
|
--disable-pygobject\
|
||||||
%if ! %{build_mono}
|
|
||||||
--disable-gtk\
|
--disable-gtk\
|
||||||
%endif
|
|
||||||
--disable-gtk3\
|
--disable-gtk3\
|
||||||
%endif
|
%endif
|
||||||
--disable-qt3\
|
--disable-qt3\
|
||||||
--disable-qt4\
|
--disable-qt4\
|
||||||
%if %{build_mono}
|
|
||||||
--enable-mono\
|
|
||||||
--disable-gtk\
|
|
||||||
%else
|
|
||||||
--disable-mono\
|
--disable-mono\
|
||||||
%endif
|
|
||||||
%if %{build_qt5}
|
%if %{build_qt5}
|
||||||
--enable-qt5\
|
--enable-qt5\
|
||||||
%else
|
%else
|
||||||
@ -626,11 +588,6 @@ cd $DIR
|
|||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_build
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_core}
|
%if %{build_core}
|
||||||
%{python_expand # build for every python flavor
|
%{python_expand # build for every python flavor
|
||||||
cd avahi-python-%{$python_bin_suffix}
|
cd avahi-python-%{$python_bin_suffix}
|
||||||
@ -649,11 +606,6 @@ cd ..
|
|||||||
done
|
done
|
||||||
cd -
|
cd -
|
||||||
%endif
|
%endif
|
||||||
%if %{build_mono} && !%{build_core}
|
|
||||||
cd avahi-sharp
|
|
||||||
%make_install
|
|
||||||
cd ../avahi-ui-sharp
|
|
||||||
%endif
|
|
||||||
%if %{build_qt5} && !%{build_core}
|
%if %{build_qt5} && !%{build_core}
|
||||||
cd avahi-qt
|
cd avahi-qt
|
||||||
%endif
|
%endif
|
||||||
@ -738,12 +690,6 @@ rm %{buildroot}/%{_mandir}/man8/avahi-dnsconfd.action.8*
|
|||||||
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
rm %{buildroot}/%{_datadir}/avahi/interfaces/avahi-discover.ui
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
rmdir %{buildroot}/%{_datadir}/avahi/interfaces
|
||||||
rmdir %{buildroot}/%{_datadir}/avahi
|
rmdir %{buildroot}/%{_datadir}/avahi
|
||||||
%else
|
|
||||||
%if %{build_mono}
|
|
||||||
%ifnarch ppc64 ppc64le s390x
|
|
||||||
strip-nondeterminism %{buildroot}/%{_prefix}/lib/monodoc/sources/*.zip
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if %{build_glib2}
|
%if %{build_glib2}
|
||||||
@ -1007,23 +953,6 @@ find %{_localstatedir}/lib/avahi-autoipd -user avahi -exec chown avahi-autoipd:a
|
|||||||
%{_datadir}/gir-1.0/*.gir
|
%{_datadir}/gir-1.0/*.gir
|
||||||
%endif
|
%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}
|
%if %{build_qt5}
|
||||||
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
%files -n libavahi-qt5-%{avahi_qt5_sover}
|
||||||
%{_libdir}/libavahi-qt5.so.*
|
%{_libdir}/libavahi-qt5.so.*
|
||||||
|
@ -13,21 +13,6 @@ if ! test -f $1/$ORIG_SPEC.spec ; then
|
|||||||
exit
|
exit
|
||||||
fi
|
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:
|
# Edit file to fit -glib2 build needs:
|
||||||
sed '
|
sed '
|
||||||
s/spec file for package avahi/spec file for package avahi-glib2/;
|
s/spec file for package avahi/spec file for package avahi-glib2/;
|
||||||
@ -60,5 +45,4 @@ rm $1/$ORIG_SPEC-qt5.spec.new
|
|||||||
|
|
||||||
# Not wanted for avahi:
|
# Not wanted for avahi:
|
||||||
#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-glib2.changes
|
#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
|
#cp -a $1/$ORIG_SPEC.changes $1/$ORIG_SPEC-qt5.changes
|
||||||
|
Loading…
Reference in New Issue
Block a user