merge of '1ccc3fc7f39ec71e356e5fb2b3794ebc1bc857d8'

Mon, 17 Sep 2007 20:49:54 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Mon, 17 Sep 2007 20:49:54 +0000
changeset 20373
b444f6954557
parent 20361
1ccc3fc7f39e (current diff)
parent 20372
6e5ba81047c8 (diff)
child 20374
9361e3d017e7

merge of '1ccc3fc7f39ec71e356e5fb2b3794ebc1bc857d8'
and '6e5ba81047c81f226a214bb1e7232e7f74976054'

--- a/pidgin.spec.in	Mon Sep 17 16:24:24 2007 +0000
+++ b/pidgin.spec.in	Mon Sep 17 20:49:54 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
 

mercurial