Mercurial > pidgin.yaz
diff gaim.spec.in @ 15539:7ae72b7c02b1
sf patch #1640011, from Celso Pinto
Patch for gaim.spec that fixes dependencies on SUSE
Add line breaks to Evan's NEWS entry
sf patch #1639901, from Saleem Abdulrasool
Fix the build failure of the Mono example dlls due to the
Mono API change
Show "(experimental)" next to the enable-mono option
when calling "./configure --help"
sf patch #1644019, from good ol' Ka-Hing Cheung
"fix compiling on gtk 2.4. xmppconsole.c is the culprit.
gtk_combo_box_get_active_text is defined in gtk 2.6 but not 2.4."
Sun apparently doesn't like when void functions return
the return value from another void function. For example:
void func1(void) {
printf("hi");
}
void func2(void) {
return func1(); /* this line causes a warning */
}
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 04 Feb 2007 08:46:24 +0000 |
parents | d41c1006e670 |
children |
line wrap: on
line diff
--- a/gaim.spec.in Sun Feb 04 08:45:07 2007 +0000 +++ b/gaim.spec.in Sun Feb 04 08:46:24 2007 +0000 @@ -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