Accepting request 48883 from GNOME:Factory
Copy from GNOME:Factory/avahi based on submit request 48883 from user vuntz OBS-URL: https://build.opensuse.org/request/show/48883 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=68
This commit is contained in:
@@ -31,7 +31,7 @@ Name: avahi-glib2
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 1
|
||||
Release: 2
|
||||
%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.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.1.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-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
|
||||
|
@@ -1,11 +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,5 +1,5 @@
|
||||
<?xml version="1.0"?>
|
||||
-<repository version="1.0"
|
||||
+<repository version="1.1"
|
||||
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">
|
32
avahi-gobject-introspection-1.2.patch
Normal file
32
avahi-gobject-introspection-1.2.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
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
|
@@ -31,7 +31,7 @@ Name: avahi-mono
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 1
|
||||
Release: 2
|
||||
%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.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.1.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-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
|
||||
|
@@ -31,7 +31,7 @@ Name: avahi-qt4
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.27
|
||||
Release: 1
|
||||
Release: 2
|
||||
%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.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.1.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-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
|
||||
|
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 18 17:29:54 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Rename avahi-gobject-introspection-1.1.patch to
|
||||
avahi-gobject-introspection-1.2.patch and update it to the 1.2
|
||||
format.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 1 13:23:37 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
@@ -33,7 +33,7 @@ Name: avahi
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.27
|
||||
Release: 1
|
||||
Release: 2
|
||||
%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.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
|
||||
Patch4: avahi-gobject-introspection-1.1.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-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
|
||||
|
Reference in New Issue
Block a user