Accepting request 39245 from home:a_jaeger:branches:openSUSE:Factory
Copy from home:a_jaeger:branches:openSUSE:Factory/avahi via accept of submit request 39245 revision 5. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/39245 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=32
This commit is contained in:
Magnus Boman
Git OBS Bridge
parent
edc418a114
commit
f4cc7ebba3
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-glib2 (Version 0.6.25)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Name: avahi-glib2
|
||||
%define _name avahi
|
||||
# In automatic build systems you want to enable just one of following options.
|
||||
# For build all at once, set all to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other options to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other option to 1.
|
||||
%define build_core 0
|
||||
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
|
||||
%define build_glib2 1
|
||||
@ -31,7 +31,7 @@ Name: avahi-glib2
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 6
|
||||
Release: 7
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
|
||||
Patch11: avahi-init_unused-not-dead.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
|
||||
# Even if we are not building python bindings, we need python to build service types database:
|
||||
BuildRequires: python-devel python-gdbm
|
||||
%if %suse_version <= 1110
|
||||
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
Requires: nss-mdns
|
||||
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
|
||||
#
|
||||
# mDNSResponder was used for <= 10.2:
|
||||
Provides: mDNSResponder = 107.5
|
||||
Obsoletes: mDNSResponder <= 107.5
|
||||
Obsoletes: mDNSResponder < 107.5
|
||||
%endif
|
||||
%if %build_glib2
|
||||
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
|
||||
@ -204,10 +204,10 @@ Obsoletes: mDNSResponder-lib-64bit
|
||||
#
|
||||
# mDNSResponder-lib was used for <= 10.2:
|
||||
Provides: mDNSResponder-lib = 107.5
|
||||
Obsoletes: mDNSResponder-lib <= 107.5
|
||||
Obsoletes: mDNSResponder-lib < 107.5
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-mDNSResponder = %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder <= %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder < %{version}
|
||||
|
||||
%description -n libdns_sd
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -230,7 +230,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
|
||||
Group: System/Libraries
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-howl = %{version}
|
||||
Obsoletes: avahi-compat-howl <= %{version}
|
||||
Obsoletes: avahi-compat-howl < %{version}
|
||||
|
||||
%description -n libhowl0
|
||||
howl compatibility layer for avahi.
|
||||
@ -255,7 +255,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
%py_requires
|
||||
|
||||
%description -n python-avahi
|
||||
@ -272,7 +272,7 @@ addition, it supports some nifty things that have never been seen
|
||||
elsewhere, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%package utils
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
@ -298,7 +298,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
Obsoletes: avahi-devel <= %{version}
|
||||
Obsoletes: avahi-devel < %{version}
|
||||
|
||||
%description -n libavahi-devel
|
||||
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
|
||||
@ -314,12 +314,12 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-mDNSResponder-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libdns_sd = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: mDNSResponder-devel = 107.5
|
||||
Obsoletes: mDNSResponder-devel <= 107.5
|
||||
Obsoletes: mDNSResponder-devel < 107.5
|
||||
|
||||
%description compat-mDNSResponder-devel
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -337,7 +337,7 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-howl-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libhowl0 = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -384,7 +384,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
|
||||
Group: System/GUI/GNOME
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-glib = %{version}
|
||||
Obsoletes: avahi-glib <= %{version}
|
||||
Obsoletes: avahi-glib < %{version}
|
||||
|
||||
%description -n libavahi-glib1
|
||||
GLib support for avahi.
|
||||
@ -451,7 +451,7 @@ Requires: python-avahi = %{version} python-gtk
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
# Provide split-provides for update from <= 11.0:
|
||||
Provides: python-avahi:%{_bindir}/avahi-bookmarks
|
||||
%py_requires
|
||||
@ -516,11 +516,12 @@ across LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-1
|
||||
|
||||
|
||||
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt3 = %{version}
|
||||
Obsoletes: avahi-qt3 <= %{version}
|
||||
Obsoletes: avahi-qt3 < %{version}
|
||||
|
||||
%description -n libavahi-qt3-1
|
||||
Qt3 bindings for avahi.
|
||||
@ -539,6 +540,7 @@ correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-devel
|
||||
|
||||
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -569,7 +571,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt4 = %{version}
|
||||
Obsoletes: avahi-qt4 <= %{version}
|
||||
Obsoletes: avahi-qt4 < %{version}
|
||||
|
||||
%description -n libavahi-qt4-1
|
||||
Qt4 bindings for avahi.
|
||||
@ -637,6 +639,7 @@ things, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
translation-update-upstream
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
@ -831,7 +834,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%{fillup_and_insserv -f -Y avahi-daemon}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
|
||||
%preun
|
||||
@ -924,7 +927,9 @@ fi
|
||||
%doc LICENSE docs/*
|
||||
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
|
||||
# avahi creates the directory itself, we do not package it
|
||||
# since it might be on tmpfs
|
||||
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
|
||||
%doc %{_mandir}/man5/*.5*
|
||||
%doc %{_mandir}/man8/*.8*
|
||||
%{_sbindir}/avahi-*
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-mono (Version 0.6.25)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Name: avahi-mono
|
||||
%define _name avahi
|
||||
# In automatic build systems you want to enable just one of following options.
|
||||
# For build all at once, set all to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other options to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other option to 1.
|
||||
%define build_core 0
|
||||
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
|
||||
%define build_glib2 0
|
||||
@ -31,7 +31,7 @@ Name: avahi-mono
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 6
|
||||
Release: 7
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
|
||||
Patch11: avahi-init_unused-not-dead.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
|
||||
# Even if we are not building python bindings, we need python to build service types database:
|
||||
BuildRequires: python-devel python-gdbm
|
||||
%if %suse_version <= 1110
|
||||
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
Requires: nss-mdns
|
||||
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
|
||||
#
|
||||
# mDNSResponder was used for <= 10.2:
|
||||
Provides: mDNSResponder = 107.5
|
||||
Obsoletes: mDNSResponder <= 107.5
|
||||
Obsoletes: mDNSResponder < 107.5
|
||||
%endif
|
||||
%if %build_glib2
|
||||
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
|
||||
@ -203,10 +203,10 @@ Obsoletes: mDNSResponder-lib-64bit
|
||||
#
|
||||
# mDNSResponder-lib was used for <= 10.2:
|
||||
Provides: mDNSResponder-lib = 107.5
|
||||
Obsoletes: mDNSResponder-lib <= 107.5
|
||||
Obsoletes: mDNSResponder-lib < 107.5
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-mDNSResponder = %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder <= %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder < %{version}
|
||||
|
||||
%description -n libdns_sd
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -229,7 +229,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
|
||||
Group: System/Libraries
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-howl = %{version}
|
||||
Obsoletes: avahi-compat-howl <= %{version}
|
||||
Obsoletes: avahi-compat-howl < %{version}
|
||||
|
||||
%description -n libhowl0
|
||||
howl compatibility layer for avahi.
|
||||
@ -254,7 +254,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
%py_requires
|
||||
|
||||
%description -n python-avahi
|
||||
@ -271,7 +271,7 @@ addition, it supports some nifty things that have never been seen
|
||||
elsewhere, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%package utils
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
@ -297,7 +297,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
Obsoletes: avahi-devel <= %{version}
|
||||
Obsoletes: avahi-devel < %{version}
|
||||
|
||||
%description -n libavahi-devel
|
||||
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
|
||||
@ -313,12 +313,12 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-mDNSResponder-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libdns_sd = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: mDNSResponder-devel = 107.5
|
||||
Obsoletes: mDNSResponder-devel <= 107.5
|
||||
Obsoletes: mDNSResponder-devel < 107.5
|
||||
|
||||
%description compat-mDNSResponder-devel
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -336,7 +336,7 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-howl-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libhowl0 = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -383,7 +383,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
|
||||
Group: System/GUI/GNOME
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-glib = %{version}
|
||||
Obsoletes: avahi-glib <= %{version}
|
||||
Obsoletes: avahi-glib < %{version}
|
||||
|
||||
%description -n libavahi-glib1
|
||||
GLib support for avahi.
|
||||
@ -450,7 +450,7 @@ Requires: python-avahi = %{version} python-gtk
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
# Provide split-provides for update from <= 11.0:
|
||||
Provides: python-avahi:%{_bindir}/avahi-bookmarks
|
||||
%py_requires
|
||||
@ -515,11 +515,12 @@ across LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-1
|
||||
|
||||
|
||||
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt3 = %{version}
|
||||
Obsoletes: avahi-qt3 <= %{version}
|
||||
Obsoletes: avahi-qt3 < %{version}
|
||||
|
||||
%description -n libavahi-qt3-1
|
||||
Qt3 bindings for avahi.
|
||||
@ -538,6 +539,7 @@ correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-devel
|
||||
|
||||
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -568,7 +570,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt4 = %{version}
|
||||
Obsoletes: avahi-qt4 <= %{version}
|
||||
Obsoletes: avahi-qt4 < %{version}
|
||||
|
||||
%description -n libavahi-qt4-1
|
||||
Qt4 bindings for avahi.
|
||||
@ -636,6 +638,7 @@ things, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
translation-update-upstream
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
@ -830,7 +833,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%{fillup_and_insserv -f -Y avahi-daemon}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
|
||||
%preun
|
||||
@ -923,7 +926,9 @@ fi
|
||||
%doc LICENSE docs/*
|
||||
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
|
||||
# avahi creates the directory itself, we do not package it
|
||||
# since it might be on tmpfs
|
||||
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
|
||||
%doc %{_mandir}/man5/*.5*
|
||||
%doc %{_mandir}/man8/*.8*
|
||||
%{_sbindir}/avahi-*
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi-qt4 (Version 0.6.25)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -23,7 +23,7 @@ Name: avahi-qt4
|
||||
%define _name avahi
|
||||
# In automatic build systems you want to enable just one of following options.
|
||||
# For build all at once, set all to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other options to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other option to 1.
|
||||
%define build_core 0
|
||||
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
|
||||
%define build_glib2 0
|
||||
@ -31,7 +31,7 @@ Name: avahi-qt4
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.25
|
||||
Release: 6
|
||||
Release: 7
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -73,7 +73,7 @@ Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
|
||||
Patch11: avahi-init_unused-not-dead.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
|
||||
# Even if we are not building python bindings, we need python to build service types database:
|
||||
BuildRequires: python-devel python-gdbm
|
||||
%if %suse_version <= 1110
|
||||
@ -86,7 +86,7 @@ Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
Requires: nss-mdns
|
||||
@ -97,7 +97,7 @@ Obsoletes: mDNSResponder-64bit
|
||||
#
|
||||
# mDNSResponder was used for <= 10.2:
|
||||
Provides: mDNSResponder = 107.5
|
||||
Obsoletes: mDNSResponder <= 107.5
|
||||
Obsoletes: mDNSResponder < 107.5
|
||||
%endif
|
||||
%if %build_glib2
|
||||
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
|
||||
@ -206,10 +206,10 @@ Obsoletes: mDNSResponder-lib-64bit
|
||||
#
|
||||
# mDNSResponder-lib was used for <= 10.2:
|
||||
Provides: mDNSResponder-lib = 107.5
|
||||
Obsoletes: mDNSResponder-lib <= 107.5
|
||||
Obsoletes: mDNSResponder-lib < 107.5
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-mDNSResponder = %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder <= %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder < %{version}
|
||||
|
||||
%description -n libdns_sd
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -232,7 +232,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
|
||||
Group: System/Libraries
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-howl = %{version}
|
||||
Obsoletes: avahi-compat-howl <= %{version}
|
||||
Obsoletes: avahi-compat-howl < %{version}
|
||||
|
||||
%description -n libhowl0
|
||||
howl compatibility layer for avahi.
|
||||
@ -257,7 +257,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
%py_requires
|
||||
|
||||
%description -n python-avahi
|
||||
@ -274,7 +274,7 @@ addition, it supports some nifty things that have never been seen
|
||||
elsewhere, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%package utils
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour
|
||||
Requires: %{_name} >= %{version}
|
||||
Group: Productivity/Networking/Other
|
||||
@ -300,7 +300,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
Obsoletes: avahi-devel <= %{version}
|
||||
Obsoletes: avahi-devel < %{version}
|
||||
|
||||
%description -n libavahi-devel
|
||||
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
|
||||
@ -316,12 +316,12 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-mDNSResponder-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libdns_sd = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: mDNSResponder-devel = 107.5
|
||||
Obsoletes: mDNSResponder-devel <= 107.5
|
||||
Obsoletes: mDNSResponder-devel < 107.5
|
||||
|
||||
%description compat-mDNSResponder-devel
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -339,7 +339,7 @@ supports some nifty things that have never been seen elsewhere like
|
||||
correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package compat-howl-devel
|
||||
License: LGPL v2.1 or later
|
||||
License: LGPLv2.1+
|
||||
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
|
||||
Requires: libavahi-devel = %{version} libhowl0 = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -386,7 +386,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
|
||||
Group: System/GUI/GNOME
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-glib = %{version}
|
||||
Obsoletes: avahi-glib <= %{version}
|
||||
Obsoletes: avahi-glib < %{version}
|
||||
|
||||
%description -n libavahi-glib1
|
||||
GLib support for avahi.
|
||||
@ -453,7 +453,7 @@ Requires: python-avahi = %{version} python-gtk
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
# Provide split-provides for update from <= 11.0:
|
||||
Provides: python-avahi:%{_bindir}/avahi-bookmarks
|
||||
%py_requires
|
||||
@ -518,11 +518,12 @@ across LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-1
|
||||
|
||||
|
||||
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt3 = %{version}
|
||||
Obsoletes: avahi-qt3 <= %{version}
|
||||
Obsoletes: avahi-qt3 < %{version}
|
||||
|
||||
%description -n libavahi-qt3-1
|
||||
Qt3 bindings for avahi.
|
||||
@ -541,6 +542,7 @@ correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-devel
|
||||
|
||||
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -571,7 +573,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt4 = %{version}
|
||||
Obsoletes: avahi-qt4 <= %{version}
|
||||
Obsoletes: avahi-qt4 < %{version}
|
||||
|
||||
%description -n libavahi-qt4-1
|
||||
Qt4 bindings for avahi.
|
||||
@ -639,6 +641,7 @@ things, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
translation-update-upstream
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
@ -833,7 +836,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%{fillup_and_insserv -f -Y avahi-daemon}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
|
||||
%preun
|
||||
@ -926,7 +929,9 @@ fi
|
||||
%doc LICENSE docs/*
|
||||
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
|
||||
# avahi creates the directory itself, we do not package it
|
||||
# since it might be on tmpfs
|
||||
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
|
||||
%doc %{_mandir}/man5/*.5*
|
||||
%doc %{_mandir}/man8/*.8*
|
||||
%{_sbindir}/avahi-*
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 1 01:54:24 UTC 2010 - aj@suse.de
|
||||
|
||||
- Handle /var/run on tmpfs.
|
||||
- Avoid self-obsoletes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 15 17:10:10 CET 2010 - sbrabec@suse.cz
|
||||
|
||||
- Do not force start avahi daemon on update (bnc#588367).
|
||||
- Added support for translation-update-upstream (FATE#301344).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 15 22:09:00 CET 2009 - jengelh@medozas.de
|
||||
|
||||
|
||||
41
avahi.spec
41
avahi.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package avahi (Version 0.6.25)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,7 +25,7 @@ Name: avahi
|
||||
%define _name avahi
|
||||
# In automatic build systems you want to enable just one of following options.
|
||||
# For build all at once, set all to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other options to 1.
|
||||
# If you set build_core to 0, you cannot set more than one other option to 1.
|
||||
%define build_core 1
|
||||
# NOTE: build_glib2 also controls build of gobject, gtk2 and pygtk code.
|
||||
%define build_glib2 0
|
||||
@ -33,7 +33,7 @@ Name: avahi
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.25
|
||||
Release: 6
|
||||
Release: 7
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
# Create split spec files only when building per partes:
|
||||
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
@ -75,7 +75,7 @@ Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
|
||||
Patch11: avahi-init_unused-not-dead.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config
|
||||
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
|
||||
# Even if we are not building python bindings, we need python to build service types database:
|
||||
BuildRequires: python-devel python-gdbm
|
||||
%if %suse_version <= 1110
|
||||
@ -88,7 +88,7 @@ Requires: %{_name}-lang = %{version}
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For update of avahi-discover.glade from == 11.0:
|
||||
Conflicts: avahi-utils-gtk <= 0.6.22
|
||||
# For python bindings and utilities:
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
#Requires: dbus-1
|
||||
Requires: nss-mdns
|
||||
@ -99,7 +99,7 @@ Obsoletes: mDNSResponder-64bit
|
||||
#
|
||||
# mDNSResponder was used for <= 10.2:
|
||||
Provides: mDNSResponder = 107.5
|
||||
Obsoletes: mDNSResponder <= 107.5
|
||||
Obsoletes: mDNSResponder < 107.5
|
||||
%endif
|
||||
%if %build_glib2
|
||||
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files
|
||||
@ -206,10 +206,10 @@ Obsoletes: mDNSResponder-lib-64bit
|
||||
#
|
||||
# mDNSResponder-lib was used for <= 10.2:
|
||||
Provides: mDNSResponder-lib = 107.5
|
||||
Obsoletes: mDNSResponder-lib <= 107.5
|
||||
Obsoletes: mDNSResponder-lib < 107.5
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-mDNSResponder = %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder <= %{version}
|
||||
Obsoletes: avahi-compat-mDNSResponder < %{version}
|
||||
|
||||
%description -n libdns_sd
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -232,7 +232,7 @@ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjou
|
||||
Group: System/Libraries
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-compat-howl = %{version}
|
||||
Obsoletes: avahi-compat-howl <= %{version}
|
||||
Obsoletes: avahi-compat-howl < %{version}
|
||||
|
||||
%description -n libhowl0
|
||||
howl compatibility layer for avahi.
|
||||
@ -257,7 +257,7 @@ Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted py
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
%py_requires
|
||||
|
||||
%description -n python-avahi
|
||||
@ -300,7 +300,7 @@ Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-cor
|
||||
Group: Development/Libraries/C and C++
|
||||
# Last appeared in OpenSUSE 10.3:
|
||||
Provides: avahi-devel = %{version}
|
||||
Obsoletes: avahi-devel <= %{version}
|
||||
Obsoletes: avahi-devel < %{version}
|
||||
|
||||
%description -n libavahi-devel
|
||||
Avahi is an Implementation the DNS Service Discovery and Multicast DNS
|
||||
@ -321,7 +321,7 @@ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroco
|
||||
Requires: libavahi-devel = %{version} libdns_sd = %{version}
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: mDNSResponder-devel = 107.5
|
||||
Obsoletes: mDNSResponder-devel <= 107.5
|
||||
Obsoletes: mDNSResponder-devel < 107.5
|
||||
|
||||
%description compat-mDNSResponder-devel
|
||||
Apple mDNSResponder compatibility layer for avahi.
|
||||
@ -386,7 +386,7 @@ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonj
|
||||
Group: System/GUI/GNOME
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-glib = %{version}
|
||||
Obsoletes: avahi-glib <= %{version}
|
||||
Obsoletes: avahi-glib < %{version}
|
||||
|
||||
%description -n libavahi-glib1
|
||||
GLib support for avahi.
|
||||
@ -453,7 +453,7 @@ Requires: python-avahi = %{version} python-gtk
|
||||
Group: Development/Languages/Python
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-python = %{version}
|
||||
Obsoletes: avahi-python <= %{version}
|
||||
Obsoletes: avahi-python < %{version}
|
||||
# Provide split-provides for update from <= 11.0:
|
||||
Provides: python-avahi:%{_bindir}/avahi-bookmarks
|
||||
%py_requires
|
||||
@ -518,11 +518,12 @@ across LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-1
|
||||
|
||||
|
||||
Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt3 = %{version}
|
||||
Obsoletes: avahi-qt3 <= %{version}
|
||||
Obsoletes: avahi-qt3 < %{version}
|
||||
|
||||
%description -n libavahi-qt3-1
|
||||
Qt3 bindings for avahi.
|
||||
@ -541,6 +542,7 @@ correct mDNS reflection accross LAN segments.
|
||||
|
||||
%package -n libavahi-qt3-devel
|
||||
|
||||
|
||||
Summary: Include Files and Libraries Mandatory for Development
|
||||
Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -571,7 +573,7 @@ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjo
|
||||
Group: System/GUI/KDE
|
||||
# Old name used for <= 10.3:
|
||||
Provides: avahi-qt4 = %{version}
|
||||
Obsoletes: avahi-qt4 <= %{version}
|
||||
Obsoletes: avahi-qt4 < %{version}
|
||||
|
||||
%description -n libavahi-qt4-1
|
||||
Qt4 bindings for avahi.
|
||||
@ -639,6 +641,7 @@ things, like correct mDNS reflection across LAN segments.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
translation-update-upstream
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
@ -833,7 +836,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%{fillup_and_insserv -f -Y avahi-daemon}
|
||||
%{fillup_and_insserv -f -y avahi-daemon}
|
||||
%{fillup_and_insserv -f avahi-dnsconfd}
|
||||
|
||||
%preun
|
||||
@ -926,7 +929,9 @@ fi
|
||||
%doc LICENSE docs/*
|
||||
# Note: This file is intentionally packaged here. It is needed for avahi-utils-gtk and python-avahi-gtk:
|
||||
%{_datadir}/pixmaps/gnome-nettool2.png
|
||||
%attr(-,avahi,avahi) %{_localstatedir}/run/avahi-daemon
|
||||
# avahi creates the directory itself, we do not package it
|
||||
# since it might be on tmpfs
|
||||
%attr(-,avahi,avahi) %ghost %{_localstatedir}/run/avahi-daemon
|
||||
%doc %{_mandir}/man5/*.5*
|
||||
%doc %{_mandir}/man8/*.8*
|
||||
%{_sbindir}/avahi-*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user