Mercurial > pidgin

changeset 21787:f595326da191

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '38cb8ea7055d8c059d560031c45e5a2eedd4b4b5' and 'e01f47781596a32f43650b309f62df34c4825aed'
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 05 Dec 2007 20:45:38 +0000
parents 770c384b1803 (current diff) e9f94dd202c8 (diff)
children 29a4b8e5f4f6
files
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Wed Dec 05 17:08:27 2007 +0000
+++ b/pidgin.spec.in	Wed Dec 05 20:45:38 2007 +0000
@@ -14,6 +14,9 @@
 %define pidginver @VERSION@
 %endif
 
+# define the minimum API version required, so we can use it for plugin deps
+%define apiver %(echo "@VERSION@"|awk -F. '{print $1"."$2}')
+
 Summary:    A GTK+ based multiprotocol instant messaging client
 Name:       @PACKAGE@
 Version:    %pidginver
@@ -29,7 +32,7 @@
 BuildRequires: gtk2-devel
 
 %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
-%{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
+%{?_with_avahi:BuildRequires: avahi-glib-devel}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -118,21 +121,21 @@
 %package -n libpurple-bonjour
 Summary:    Bonjour plugin for Pidgin
 Group:      Applications/Internet
-Requires:   libpurple = %{version}
+Requires:   libpurple >= %{apiver}
 %endif
 
 %if 0%{?_with_meanwhile:1}
 %package -n libpurple-meanwhile
 Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
 Group:      Applications/Internet
-Requires:   libpurple = %{version}
+Requires:   libpurple >= %{apiver}
 %endif
 
 %if 0%{?_with_mono:1}
 %package -n libpurple-mono
 Summary:    Mono .NET plugin support for Pidgin
 Group:      Applications/Internet
-Requires:   libpurple = %{version}
+Requires:   libpurple >= %{apiver}
 %endif
 
 %if 0%{!?_without_text:1}
@@ -462,6 +465,12 @@
 %endif
 
 %changelog
+* Wed Dec  5 2007 Stu Tomlinson <stu@nosnilmot.com>
+- When building with avahi, use native avahi instead of howl compatability
+  headers
+- Make the split out plugins depend only on the minimum necessary API
+  version of libpurple
+
 * Tue Oct 23 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Add finch.pc to finch-devel