pidgin/pidgin

sf patch #1640011, from Celso Pinto

2007-01-25, Mark Doliner
131ead1b6880
Parents 52bd37e96ada
Children 52e266ba6ecd
sf patch #1640011, from Celso Pinto
Patch for gaim.spec that fixes dependencies on SUSE
2 files changed, 12 insertions(+), 6 deletions(-)
  • +1 -0
    COPYRIGHT
  • +11 -6
    gaim.spec.in
    • --- a/COPYRIGHT Thu Jan 25 07:32:30 2007 +0000
    +++ b/COPYRIGHT Thu Jan 25 07:47:05 2007 +0000
    @@ -242,6 +242,7 @@
    Havoc Pennington
    Ted Percival
    Eduardo Pérez
    +Celso Pinto
    Joao Luís Marques Pinto
    Aleksander Piotrowski
    Julien Pivotto
    --- a/gaim.spec.in Thu Jan 25 07:32:30 2007 +0000
    +++ b/gaim.spec.in Thu Jan 25 07:47:05 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