[Gaim-commits] SF.net SVN: gaim: [18171] trunk

[<the...@us...>]

Revision: 18171
          http://svn.sourceforge.net/gaim/?rev=18171&view=rev
Author:   thekingant
Date:     2007-01-24 23:44:39 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
sf patch #1640011, from Celso Pinto
Patch for gaim.spec that fixes dependencies on SUSE

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/gaim.spec.in

Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2007-01-25 07:30:13 UTC (rev 18170)
+++ trunk/COPYRIGHT	2007-01-25 07:44:39 UTC (rev 18171)
@@ -242,6 +242,7 @@
 Havoc Pennington
 Ted Percival
 Eduardo Pérez
+Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
 Julien Pivotto

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2007-01-25 07:30:13 UTC (rev 18170)
+++ trunk/gaim.spec.in	2007-01-25 07:44:39 UTC (rev 18171)
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 6
+#define beta 7
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')
@@ -29,8 +29,6 @@
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
-%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
-%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -40,6 +38,16 @@
 %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
 %{!?_without_text:BuildRequires: ncurses-devel}
 
+%if "%{_vendor}" == "suse"
+# For SuSE:
+BuildRequires: gnutls-devel
+%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
+%else
+%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
+%endif
+
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # For Mandrake/Mandriva:
@@ -48,10 +56,7 @@
 %else
 # For SuSE, Red Hat, Fedora and others:
 BuildRequires: gtk2-devel
-%if "%{_vendor}" == "suse"
-# For SuSE:
-BuildRequires: gnutls-devel
-%else
+%if "%{_vendor}" != "suse"
 # For Red Hat, Fedora and others:
 # let's assume RH & FC1 are the only brain-dead distros missing the
 # perl-XML-Parser dependency on intltool and that other RH/FC releases


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.