Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.86
diff -u -u -r1.86 gaim.spec.in
--- gaim.spec.in	12 Oct 2003 03:32:40 -0000	1.86
+++ gaim.spec.in	2 Nov 2003 17:19:33 -0000
@@ -10,12 +10,28 @@
 Source:     %{name}-%{version}.tar.gz
 Packager:   Rob Flynn <rob@marko.net>
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
+%{!?_without_ssl:Requires: mozilla-nss, mozilla-nspr}
+%{!?_without_gtkspell:Requires: gtkspell}
+%{!?_without_audio:Requires: audiofile, libao}
+%{!?_without_perl:Requires: perl}
+%{!?_without_tcl:Requires: tcl %{!?_without_tk:tk}}
+%{?_with_nas:Requires: nas}
+BuildRequires: pkgconfig, libtool
+%{!?_without_audio:BuildRequires: audiofile-devel, libao-devel}
+%{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+%{!?_without_perl:BuildRequires: perl}
+%{!?_without_tcl:BuildRequires: tcl %{!?_without_tk:tk}}
+%{?_with_nas:BuildRequires: nas-devel}
 %if "%{_vendor}" != "MandrakeSoft"
-Requires:   gtk2 >= 2.0.0, mozilla-nss, gtkspell, audiofile, libao
-BuildRequires: libao-devel, gtk2-devel, gtkspell-devel, libtool, audiofile-devel, pkgconfig, mozilla-nss-devel
+Requires:   gtk2 >= 2.0.0
+%{!?_without_audio:Requires: audiofile, libao}
+BuildRequires: gtk2-devel
+%{!?_without_ssl:BuildRequires: mozilla-nss-devel, mozilla-nspr-devel}
 %else
-Requires:   gtk+2.0 >= 2.0.0, libnss3
-BuildRequires: libao-devel, libgtk+2.0_0-devel, gtkspell-devel, libtool, audiofile-devel, pkgconfig, libnss3-devel
+Requires:   gtk+2.0 >= 2.0.0
+%{!?_without_ssl:Requires: libnss3, libnspr4}
+BuildRequires: libgtk+2.0_0-devel
+%{!?_without_ssl:BuildRequires: libnss3-devel, libnspr4-devel}
 %endif
 
 %package devel
@@ -35,6 +51,10 @@
 Gaim is NOT affiliated with or endorsed by America Online, Inc., 
 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
 
+Available rpmbuild rebuild options :
+  --without audio gtkspell ssl perl tcl tk
+  --with nas
+
 %description devel
 
 The gaim-devel package contains the header files, developer
@@ -52,12 +72,21 @@
                                     --libdir=%{_libdir} \
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
-                                    --with-perl-lib=%{buildroot}%{_prefix}
+                                    --with-perl-lib=%{buildroot}%{_prefix} \
+                                    %{?_without_audio:--disable-audio} \
+                                    %{?_without_gtkspell:--disable-gtkspell} \
+                                    %{?_without_ssl:--enable-nss=no --enable-gnutls=no} \
+                                    %{!?_without_ssl:--enable-nss=yes} \
+                                    %{?_without_perl:--disable-perl} \
+                                    %{?_without_tcl:--disable-tcl} \
+                                    %{?_without_tk:--disable-tk} \
+                                    %{?_with_nas:--enable-nas}
+
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
+make %{?_smp_mflags} prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
      datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \
      libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \
      sysconfdir=%{buildroot}%{_sysconfdir} \
@@ -76,12 +105,12 @@
 %doc doc/the_penguin.txt doc/CREDITS doc/FAQ NEWS COPYING AUTHORS
 %doc README ChangeLog
 %doc %{_mandir}/man1/*
-%doc %{_mandir}/man3*/*
+%{!?_without_perl:%doc %{_mandir}/man3*/*}
 
 %dir %{_libdir}/gaim
 %attr(755, root, root) %{_libdir}/gaim/*
 %attr(755, root, root) %{_libdir}/libgaim-remote.so.*
-%attr(755, root, root) %{_libdir}/perl5
+%{!?_without_perl:%attr(755, root, root) %{_libdir}/perl5}
 
 %{_bindir}/*
 %{_datadir}/locale/*/*/*
@@ -100,6 +129,13 @@
 %{_includedir}/gaim-remote/*.h
 
 %changelog
+* Sun Nov  2 2003 Stu Tomlinson <stu@nosnilmot.com>
+- add --without options for audio, gtkspell, ssl, perl, tcl, tk
+  and a --with option for nas
+- split out common Requires & BuildRequires from the Mandrake bits
+- add conditional Requires & BuildRequires for new --without and
+  --with options
+
 * Sun Jul 20 2003 Bjoern Voigt <bjoern@cs.tu-berlin.de>
 - Added pkgconfig build dependency.
 - if "%{_vendor}" != "MandrakeSoft" now also works with rpm 3.x.