# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1156093238 0
# Node ID eec43f2ef6339d79acd94acf7b52d45d1521b259
# Parent  ab8a105eff620890fcaaa34353cc021802d8ed98
[gaim-migrate @ 16906]
Make the gstreamer-devel BuildReq optional and restore some names in
the %changelog

committer: Tailor Script <tailor@pidgin.im>

diff -r ab8a105eff62 -r eec43f2ef633 gaim.spec.in
--- a/gaim.spec.in	Sun Aug 20 16:49:37 2006 +0000
+++ b/gaim.spec.in	Sun Aug 20 17:00:38 2006 +0000
@@ -27,7 +27,8 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gettext, gstreamer-devel
+BuildRequires: libtool, pkgconfig, intltool, gettext
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel}
 %{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
@@ -179,7 +180,8 @@
                                     %{!?_with_tcl:--disable-tcl} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
-                                    %{?_with_sasl:--enable-cyrus-sasl}
+                                    %{?_with_sasl:--enable-cyrus-sasl} \
+                                    %{?_without_gstreamer:--disable-gstreamer}
 
 make %{?_smp_mflags}
 
@@ -323,21 +325,25 @@
 %endif
 
 %changelog
-* Tue Aug 15 2006 <thekingant@users.sourceforge.net>
+* Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+- Make the gstreamer-devel dependency overridable with '--without-gstreamer'
+  to allow building on older distributions without suitable gstreamer
+
+* Tue Aug 15 2006 Mark Doliner <thekingant@users.sourceforge.net>
 - Add a BuildRequire for gstreamer-devel
 - Remove the BuildRequires for audiofile-devel and libao-devel
 
-* Mon May 8 2006 <thekingant@users.sourceforge.net>
+* Mon May 8 2006 Mark Doliner <thekingant@users.sourceforge.net>
 - Add --with avahi option to compile the gaim-bonjour package against
   Avahi's Howl compatibility layer
 
-* Wed Mar 29 2006 <stu@nosnilmot.com>
+* Wed Mar 29 2006 Stu Tomlinson <stu@nosnilmot.com>
 - Source RPM uses tar.bz2 now to save space
 - Update BuildRequires for new intltool dependencies
 - Add a --with perlmakehack option to allow builds to succeed on RH9
 - Add a --with gadugadu to build (separate) gaim-gadugadu package
 
-* Sat Dec 17 2005 <stu@nosnilmot.com>
+* Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
 - Add support for beta versions so the subsequent releases are seen as newer
   by RPM
 - Split of sametime support to gaim-meanwhile
@@ -345,19 +351,19 @@
 - Default build to include cyrus-sasl support in Jabber
 - Add --with dbus to build with DBUS support
 
-* Sun Dec 04 2005 <siege@preoccupied.net>
+* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
 - Added obsoletes gaim-meanwhile
 
-* Sun Oct 30 2005 <stu@nosnilmot.com>
+* Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
 - Add separate gaim-bonjour package if built with --with-howl
 - Add separate gaim-mono package if built with --with-mono
 - Exclude some unwanted perl files
 
-* Sat Aug 20 2005 <stu@nosnilmot.com>
+* Sat Aug 20 2005 Stu Tomlinson <stu@nosnilmot.com>
 - Include libgaimperl.so
 - Include gaim.m4 in gaim-devel
 
-* Thu Apr 28 2005 <stu@nosnilmot.com>
+* Thu Apr 28 2005 Stu Tomlinson <stu@nosnilmot.com>
 - Use perl_vendorlib & perl_archlib for better 64bit compat (Jeff Mahoney)
 - Clean up Requires, most should be auto-detected
 - Restore gtkspell-devel build requirement (and add --without gtkspell option)