changeset 20146:ad691fe92bf8

merge of '581cfaaf2f02af0abbaa8910cedb9f7f62b25a5c' and '8bb511fc7058716755e1117ddde9b2baa349cbab'
author Casey Harkins <charkins@pidgin.im>
date Tue, 18 Sep 2007 01:02:45 +0000
parents 743cb3444b6b (current diff) aa2302267aa9 (diff)
children 51457cf3d27b
files
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Tue Sep 18 01:02:40 2007 +0000
+++ b/pidgin.spec.in	Tue Sep 18 01:02:45 2007 +0000
@@ -44,9 +44,15 @@
 BuildRequires: gnutls-devel
 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
+Requires(pre): gconf2
+Requires(post): gconf2
+Requires(preun): gconf2
 %else
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 %endif
 
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
@@ -72,9 +78,7 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires: libpurple = %{version}
 
 Obsoletes: gaim
 Provides: gaim
@@ -457,6 +461,10 @@
 %endif
 
 %changelog
+* Mon Sep 17 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Add version dependency on libpurple for pidgin
+- Support for OpenSuse lowercase package name for GConf2
+
 * Fri Sep 14 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Fix spec file for moved sounds & new CA certificates