Accepting request 96133 from home:dimstar:branches:GNOME:Factory

Push typelib change branch

OBS-URL: https://build.opensuse.org/request/show/96133
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=75

avahi-gir-fixup.patch

@@ -0,0 +1,13 @@
+Index: avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir
+===================================================================
+--- avahi-0.6.30.orig/avahi-gobject/AvahiCore-0.6.gir
++++ avahi-0.6.30/avahi-gobject/AvahiCore-0.6.gir
+@@ -3,7 +3,7 @@
+             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">
++  <namespace name="AvahiCore" version="0.6" shared-library="libavahi-core.so.7">
+     <alias name="IfIndex" c:type="AvahiIfIndex">
+       <type name="gint" c:type="int"/>
+     </alias>

avahi-glib2.spec

@@ -37,6 +37,7 @@ Release:        5
 %endif
 %define avahi_client_soname 3
 %define avahi_common_soname 3
+# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch
 %define avahi_core_soname 7
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
@@ -70,6 +71,8 @@ Patch3:         avahi-empty-share-dir.patch
 Patch10:        avahi-unicastdomains.patch
 # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
 Patch11:        avahi-gtk_box_new.patch
+# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
+Patch12:        avahi-gir-fixup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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:
@@ -430,6 +433,23 @@ 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.
 
+%package -n typelib-1_0-Avahi-0_6
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Libraries
+
+%description -n typelib-1_0-Avahi-0_6
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS 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 complete with features, 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.
+
 %package -n avahi-utils-gtk
 Summary:        GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
 Requires:       %{_name} >= %{version}
@@ -484,6 +504,7 @@ Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui0 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
+Requires:       typelib-1_0-Avahi-0_6 = %{version}
 Group:          Development/Libraries/C and C++
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -650,6 +671,7 @@ translation-update-upstream
 %patch3
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1090,6 +1112,9 @@ fi
 %files -n libavahi-gobject0
 %defattr(-,root,root)
 %{_libdir}/libavahi-gobject*.so.*
+
+%files -n typelib-1_0-Avahi-0_6
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Avahi-0.6.typelib
 %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
 

avahi-mono.spec

@@ -37,6 +37,7 @@ Release:        5
 %endif
 %define avahi_client_soname 3
 %define avahi_common_soname 3
+# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch
 %define avahi_core_soname 7
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
@@ -70,6 +71,8 @@ Patch3:         avahi-empty-share-dir.patch
 Patch10:        avahi-unicastdomains.patch
 # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
 Patch11:        avahi-gtk_box_new.patch
+# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
+Patch12:        avahi-gir-fixup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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:
@@ -147,28 +150,6 @@ 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.
 
-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.
-
-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.
-
 %if %build_core
 
 %package -n libavahi-client3
@@ -462,6 +443,23 @@ 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.
 
+%package -n typelib-1_0-Avahi-0_6
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Libraries
+
+%description -n typelib-1_0-Avahi-0_6
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS 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 complete with features, 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.
+
 %package -n avahi-utils-gtk
 Summary:        GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
 Requires:       %{_name} >= %{version}
@@ -516,6 +514,7 @@ Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui0 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
+Requires:       typelib-1_0-Avahi-0_6 = %{version}
 Group:          Development/Libraries/C and C++
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -681,28 +680,6 @@ 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.
 
-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.
-
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
 %endif
 %lang_package
 %endif
@@ -715,6 +692,7 @@ translation-update-upstream
 %patch3
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1155,6 +1133,9 @@ fi
 %files -n libavahi-gobject0
 %defattr(-,root,root)
 %{_libdir}/libavahi-gobject*.so.*
+
+%files -n typelib-1_0-Avahi-0_6
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Avahi-0.6.typelib
 %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
 

avahi-qt4.spec

@@ -37,6 +37,7 @@ Release:        5
 %endif
 %define avahi_client_soname 3
 %define avahi_common_soname 3
+# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch
 %define avahi_core_soname 7
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
@@ -70,6 +71,8 @@ Patch3:         avahi-empty-share-dir.patch
 Patch10:        avahi-unicastdomains.patch
 # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
 Patch11:        avahi-gtk_box_new.patch
+# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
+Patch12:        avahi-gir-fixup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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:
@@ -432,6 +435,23 @@ 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.
 
+%package -n typelib-1_0-Avahi-0_6
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Libraries
+
+%description -n typelib-1_0-Avahi-0_6
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS 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 complete with features, 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.
+
 %package -n avahi-utils-gtk
 Summary:        GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
 Requires:       %{_name} >= %{version}
@@ -486,6 +506,7 @@ Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui0 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
+Requires:       typelib-1_0-Avahi-0_6 = %{version}
 Group:          Development/Libraries/C and C++
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -652,6 +673,7 @@ translation-update-upstream
 %patch3
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1092,6 +1114,9 @@ fi
 %files -n libavahi-gobject0
 %defattr(-,root,root)
 %{_libdir}/libavahi-gobject*.so.*
+
+%files -n typelib-1_0-Avahi-0_6
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Avahi-0.6.typelib
 %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
 

avahi.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Dec  8 17:16:31 UTC 2011 - dimstar@opensuse.org
+
+- Add avahi-gir-fixup.patch: Change the gir/typelib dependency to
+  be correctly libavahi-core.so.7 instead of avahi-core.
+
+-------------------------------------------------------------------
+Wed Dec  7 10:52:27 UTC 2011 - dimstar@opensuse.org
+
+- Split the typelib files in typelib-1_0-Avahi-0_6.
+
 -------------------------------------------------------------------
 Sun Dec  4 13:40:54 UTC 2011 - dimstar@opensuse.org
 

avahi.spec

@@ -39,6 +39,7 @@ Release:        5
 %endif
 %define avahi_client_soname 3
 %define avahi_common_soname 3
+# If avahi_core_soname changes, make sure to update avahi-gir-fixup.patch
 %define avahi_core_soname 7
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
@@ -72,6 +73,8 @@ Patch3:         avahi-empty-share-dir.patch
 Patch10:        avahi-unicastdomains.patch
 # PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
 Patch11:        avahi-gtk_box_new.patch
+# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
+Patch12:        avahi-gir-fixup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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:
@@ -432,6 +435,23 @@ 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.
 
+%package -n typelib-1_0-Avahi-0_6
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Libraries
+
+%description -n typelib-1_0-Avahi-0_6
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS 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 complete with features, 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.
+
 %package -n avahi-utils-gtk
 Summary:        GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour
 Requires:       %{_name} >= %{version}
@@ -486,6 +506,7 @@ Requires:       libavahi-devel = %{version}
 Requires:       libavahi-glib1 = %{version}
 Requires:       libavahi-ui0 = %{version}
 Requires:       libavahi-ui-gtk3-%{avahi_gtk3_soname} = %{version}
+Requires:       typelib-1_0-Avahi-0_6 = %{version}
 Group:          Development/Libraries/C and C++
 # Last appeared in OpenSUSE 10.3:
 Provides:       avahi-devel:%{_libdir}/libavahi-glib.so
@@ -652,6 +673,7 @@ translation-update-upstream
 %patch3
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.
@@ -1092,6 +1114,9 @@ fi
 %files -n libavahi-gobject0
 %defattr(-,root,root)
 %{_libdir}/libavahi-gobject*.so.*
+
+%files -n typelib-1_0-Avahi-0_6
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Avahi-0.6.typelib
 %{_libdir}/girepository-1.0/AvahiCore-0.6.typelib