Accepting request 50649 from GNOME:Factory
Copy from GNOME:Factory/avahi based on submit request 50649 from user vuntz OBS-URL: https://build.opensuse.org/request/show/50649 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=69
This commit is contained in:
OBS User autobuild
Git OBS Bridge
commit
e9b672442e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:86e159d1edafcd7dbd16f8638a5bab592165fc08fc4603f3e9b30ce479886a63
|
||||
size 905690
|
||||
3
avahi-0.6.28.tar.bz2
Normal file
3
avahi-0.6.28.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ac7309cd1469988f4ddd8be6b0d67b6e6b4180fe0b7c62fa83b8f1be24589535
|
||||
size 906458
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-glib2 (Version 0.6.27)
|
||||
# spec file for package avahi-glib2 (Version 0.6.28)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,8 +30,8 @@ Name: avahi-glib2
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 2
|
||||
Version: 0.6.28
|
||||
Release: 1
|
||||
%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})
|
||||
@ -68,8 +68,8 @@ Patch1: avahi-desktop.patch
|
||||
Patch2: avahi-init-lsb.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.2.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
|
||||
Patch4: avahi-init-dnsconfd-fix-status.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
|
||||
Patch5: avahi-fix-howl.pc.patch
|
||||
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm
|
||||
%if %build_core
|
||||
Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
Recommends: %{_name}-lang
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
|
||||
===================================================================
|
||||
--- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir
|
||||
+++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
|
||||
@@ -1,10 +1,12 @@
|
||||
<?xml version="1.0"?>
|
||||
-<repository version="1.0"
|
||||
+<repository version="1.2"
|
||||
xmlns="http://www.gtk.org/introspection/core/1.0"
|
||||
xmlns:c="http://www.gtk.org/introspection/c/1.0"
|
||||
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
|
||||
<namespace name="AvahiCore" version="0.6" shared-library="avahi-core">
|
||||
- <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/>
|
||||
+ <alias name="IfIndex" c:type="AvahiIfIndex">
|
||||
+ <type name="gint" c:type="int"/>
|
||||
+ </alias>
|
||||
<enumeration name="Protocol" c:type="AvahiProtocol">
|
||||
<member name="inet"
|
||||
value="0"
|
||||
Index: avahi-0.6.27/configure.ac
|
||||
===================================================================
|
||||
--- avahi-0.6.27.orig/configure.ac
|
||||
+++ avahi-0.6.27/configure.ac
|
||||
@@ -472,7 +472,7 @@ AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAV
|
||||
#
|
||||
# Introspection support.
|
||||
#
|
||||
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
|
||||
+GOBJECT_INTROSPECTION_CHECK([0.9.5])
|
||||
|
||||
#
|
||||
# Check for Qt 3
|
||||
25
avahi-init-dnsconfd-fix-status.patch
Normal file
25
avahi-init-dnsconfd-fix-status.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From bd76c886b4bd44abad745b4b3c4bb99fe752c8f0 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Untz <vuntz@opensuse.org>
|
||||
Date: Wed, 13 Oct 2010 16:36:35 +0200
|
||||
Subject: [PATCH] init: suse, avahi-dnsconfd status reports dead instead of unused
|
||||
|
||||
---
|
||||
initscript/suse/avahi-dnsconfd.in | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/initscript/suse/avahi-dnsconfd.in b/initscript/suse/avahi-dnsconfd.in
|
||||
index e633b8d..4169737 100644
|
||||
--- a/initscript/suse/avahi-dnsconfd.in
|
||||
+++ b/initscript/suse/avahi-dnsconfd.in
|
||||
@@ -37,7 +37,7 @@ case "$1" in
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for Avahi DNS Configuration daemon: "
|
||||
- $AVAHI_BIN -c
|
||||
+ $AVAHI_BIN -c || _rc_status=3
|
||||
rc_status -v
|
||||
;;
|
||||
*)
|
||||
--
|
||||
1.7.3.1
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-mono (Version 0.6.27)
|
||||
# spec file for package avahi-mono (Version 0.6.28)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,8 +30,8 @@ Name: avahi-mono
|
||||
%define build_mono 1
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 2
|
||||
Version: 0.6.28
|
||||
Release: 1
|
||||
%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})
|
||||
@ -68,8 +68,8 @@ Patch1: avahi-desktop.patch
|
||||
Patch2: avahi-init-lsb.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.2.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
|
||||
Patch4: avahi-init-dnsconfd-fix-status.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
|
||||
Patch5: avahi-fix-howl.pc.patch
|
||||
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm
|
||||
%if %build_core
|
||||
Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
Recommends: %{_name}-lang
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi-qt4 (Version 0.6.27)
|
||||
# spec file for package avahi-qt4 (Version 0.6.28)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,8 +30,8 @@ Name: avahi-qt4
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.27
|
||||
Release: 2
|
||||
Version: 0.6.28
|
||||
Release: 1
|
||||
%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})
|
||||
@ -68,8 +68,8 @@ Patch1: avahi-desktop.patch
|
||||
Patch2: avahi-init-lsb.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.2.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
|
||||
Patch4: avahi-init-dnsconfd-fix-status.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
|
||||
Patch5: avahi-fix-howl.pc.patch
|
||||
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
@ -84,7 +84,7 @@ BuildRequires: python-devel python-gdbm
|
||||
%if %build_core
|
||||
Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
Recommends: %{_name}-lang
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 13 16:43:18 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Add avahi-init-dnsconfd-fix-status.patch to make avahi-dnsconfd
|
||||
init script report unused instead of dead in status when it's
|
||||
unused.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 5 10:52:15 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 0.6.28:
|
||||
+ Updates regarding systemd integration
|
||||
+ Properly avoid bus activation on non-systemd systems
|
||||
+ Compatibility with newer gtk3 and gobject introspection
|
||||
+ i18n updates
|
||||
+ Minor other updates
|
||||
- Drop avahi-gobject-introspection-1.2.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 29 02:11:18 UTC 2010 - aj@suse.de
|
||||
|
||||
- Change lang package Requires to Recommends since it is not
|
||||
mandatory at runtime.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 18 17:29:54 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
12
avahi.spec
12
avahi.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package avahi (Version 0.6.27)
|
||||
# spec file for package avahi (Version 0.6.28)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -32,8 +32,8 @@ Name: avahi
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 2
|
||||
Version: 0.6.28
|
||||
Release: 1
|
||||
%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})
|
||||
@ -70,8 +70,8 @@ Patch1: avahi-desktop.patch
|
||||
Patch2: avahi-init-lsb.patch
|
||||
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.2.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-init-dnsconfd-fix-status.patch vuntz@opensuse.org -- Report unused instead of dead for dnsconfd init script, sent upstream by mail
|
||||
Patch4: avahi-init-dnsconfd-fix-status.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
|
||||
Patch5: avahi-fix-howl.pc.patch
|
||||
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
@ -86,7 +86,7 @@ BuildRequires: python-devel python-gdbm
|
||||
%if %build_core
|
||||
Source5: %{_name}_spec-prepare.sh
|
||||
PreReq: pwdutils
|
||||
Requires: %{_name}-lang = %{version}
|
||||
Recommends: %{_name}-lang
|
||||
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
|
||||
# For python bindings and utilities:
|
||||
#BuildRequires: dbus-1-python
|
||||
|
||||
Loading…
Reference in New Issue
Block a user