changeset 547:8086ed233742

[gaim-migrate @ 557] gaim.spec now also builds gaim-applet.rpm committer: Tailor Script <[e-mail]>

--- a/configure.in	Fri Jul 28 18:48:56 2000 +0000
+++ b/configure.in	Fri Jul 28 20:05:43 2000 +0000
@@ -32,13 +32,16 @@
 dnl This is a bad, bad hack.  I am a bad, bad man.
 CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I../"
 
+AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
 AC_ARG_ENABLE(debug, [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(gnome, [  --enable-gnome          compile as a GNOME applet],,enable_gnome=no)
+AC_ARG_ENABLE(gnome, [  --enable-gnome          compile as a GNOME applet],,enable_gnome=$enable_distrib)
 AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_gnome" = "xyes")
 AC_ARG_ENABLE(esd,   [  --disable-esd           Turn off ESD (default=auto)],enable_esd=no,enable_esd=yes)
 AC_ARG_ENABLE(nas,   [  --enable-nas            Enable NAS (Network Audio System) support],,enable_nas=no)
 AC_ARG_ENABLE(plugins, [  --disable-plugins       compile with out plugin support],enable_plugins=no,enable_plugins=yes)
 AM_CONDITIONAL(PLUGINS, test x$enable_plugins = xyes)
+AC_ARG_ENABLE(,,,)
 
 if test "$enable_debug" = yes ; then
 dnl	someone please tell me what -d does

--- a/gaim.spec.in	Fri Jul 28 18:48:56 2000 +0000
+++ b/gaim.spec.in	Fri Jul 28 20:05:43 2000 +0000
@@ -27,16 +27,38 @@
 It contains many of the same features as AOL's IM client while at
 the same time incorporating many new features.
 
+%package applet
+Summary:	A Gnome client compatible with AOL's 'Instant Messenger'
+Group:		Applications/Internet
+Requires:	gtk+ >= 1.2.3
+
+%description applet
+Gaim allows you to talk to anyone using AOL's 
+Instant Messenger service (you can sign up at http://www.aim.aol.com).  
+
+It uses the TOC version of the AOL protocol, so your buddy list is 
+stored on AOL's servers and can be retrieved from anywhere.
+
+It contains many of the same features as AOL's IM client while at
+the same time incorporating many new features.
+
+The applet sits in your Gnome panel. It has all the same functionality
+as the regular application but takes less desktop space.
+
 %prep
 %setup
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
 make
+if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+make prefix=$RPM_BUILD_ROOT%{prefix} install-strip
+make distclean
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=${prefix} --enable-distrib
+make
 
 %install
-if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
-mkdir -p $RPM_BUILD_ROOT%{prefix}
 make prefix=$RPM_BUILD_ROOT%{prefix} install-strip
 
 %files
@@ -47,5 +69,17 @@
 %{prefix}/share/locale/*/*/*
 %{prefix}/share/pixmaps/gaim.xpm
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
+
+%files applet
+%defattr(-,root,root)
+%attr(755,root,root) %{prefix}/bin/gaim_applet
+%doc doc/the_penguin.txt doc/PROTOCOL doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README README.plugins ChangeLog
+%{prefix}/lib/gaim/*
+%{prefix}/share/locale/*/*/*
+%{prefix}/share/sounds/gaim/*
+%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim/gnome/*
+%{prefix}/share/gnome/apps/Internet/gaim.desktop
+
 %clean
 rm -r $RPM_BUILD_ROOT

--- a/pixmaps/Makefile.am	Fri Jul 28 18:48:56 2000 +0000
+++ b/pixmaps/Makefile.am	Fri Jul 28 20:05:43 2000 +0000
@@ -93,3 +93,14 @@
 	gnome/penguin-connect.png gnome/devil-offline.png \
 	gnome/devil-connect.png gnome/devil-online.png
 endif
+
+if DISTRIB
+pixmapdistribdir = $(datadir)/pixmaps
+pixmapdistrib_DATA = gaim.xpm
+gnomedistribdir = $(datadir)/pixmaps/gaim/gnome
+gnomedistrib_DATA = 
+gnomepixmapdistribdir = $(datadir)/pixmaps/gaim
+gnomepixmapdistrib_DATA = gnome/penguin-online.png gnome/penguin-offline.png \
+	gnome/penguin-connect.png gnome/devil-offline.png \
+	gnome/devil-connect.png gnome/devil-online.png
+endif

--- a/sounds/Makefile.am	Fri Jul 28 18:48:56 2000 +0000
+++ b/sounds/Makefile.am	Fri Jul 28 20:05:43 2000 +0000
@@ -26,3 +26,8 @@
 gaimsoundsdir = $(gnomedata)/sounds/gaim
 gaimsounds_DATA = $(EXTRA_DIST)
 endif
+
+if DISTRIB
+gaimdistribdir = $(datadir)/sounds/gaim
+gaimdistrib_DATA = $(EXTRA_DIST)
+endif