From 3c8e583eebee29b5d801e8d3e4b183136e9ef04f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 25 Sep 2013 12:18:36 +0200 Subject: [PATCH] Make sure the split up -devel package require avahi-devel This adds back the dependency on the base -devel that was dropped in commit b09f78ff7fd369ad57fca60db5676b2ac3d18ab9. Most of the existing packages just have deps on e.g. avahi-glib-devel and expect to have avahi-devel pulled in as well, failing to build otherwise. --- avahi.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/avahi.spec b/avahi.spec index c4fad82..558e840 100644 --- a/avahi.spec +++ b/avahi.spec @@ -16,7 +16,7 @@ Name: avahi Version: 0.6.31 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -110,8 +110,8 @@ Libraries for easy use of avahi from glib applications. %package glib-devel Summary: Libraries and header files for avahi glib development +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-glib%{?_isa} = %{version}-%{release} -#Requires: %{name}-devel = %{version}-%{release} Requires: glib2-devel %description glib-devel @@ -128,6 +128,7 @@ This library contains a GObject wrapper for the Avahi API %package gobject-devel Summary: Libraries and header files for Avahi GObject development +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-gobject%{?_isa} = %{version}-%{release} #Requires: %{name}-glib-devel = %{version}-%{release} @@ -155,6 +156,7 @@ This library contains a Gtk 3.x widget for browsing services. %package ui-devel Summary: Libraries and header files for Avahi UI development +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-ui%{?_isa} = %{version}-%{release} Requires: %{name}-ui-gtk3%{?_isa} = %{version}-%{release} #Requires: %{name}-glib-devel = %{version}-%{release} @@ -172,8 +174,8 @@ Libraries for easy use of avahi from Qt3 applications. %package qt3-devel Summary: Libraries and header files for avahi Qt3 development +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-qt3%{?_isa} = %{version}-%{release} -#Requires: %{name}-devel = %{version}-%{release} %description qt3-devel The avahi-qt3-devel package contains the header files and libraries @@ -188,8 +190,8 @@ Libraries for easy use of avahi from Qt4 applications. %package qt4-devel Summary: Libraries and header files for avahi Qt4 development +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: %{name}-qt4%{?_isa} = %{version}-%{release} -#Requires: %{name}-devel = %{version}-%{release} %description qt4-devel Th avahi-qt4-devel package contains the header files and libraries @@ -259,7 +261,7 @@ Libraries that are compatible with those provided by the howl package. %package compat-howl-devel Summary: Header files for development with the howl compatibility libraries Requires: %{name}-compat-howl%{?_isa} = %{version}-%{release} -#Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Obsoletes: howl-devel Provides: howl-devel @@ -278,7 +280,7 @@ Libraries for Apple Bonjour mDNSResponder compatibility. %package compat-libdns_sd-devel Summary: Header files for the Apple Bonjour mDNSResponder compatibility libraries Requires: %{name}-compat-libdns_sd%{?_isa} = %{version}-%{release} -#Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description compat-libdns_sd-devel Header files for development with the Apple Bonjour mDNSResponder compatibility @@ -623,6 +625,9 @@ getent passwd avahi-autoipd >/dev/null 2>&1 || useradd \ %endif %changelog +* Wed Sep 25 2013 Kalev Lember - 0.6.31-19 +- Make sure the split up -devel package require avahi-devel + * Sat Sep 21 2013 Kalev Lember - 0.6.31-18 - Allow building with deprecated GTK+ symbols (#1001676)