On Sun, 2002-03-24 at 23:34, Geoffrey Lee wrote:
>
> Sorry for the late reply.
n/p : )
>
> I just uploaded the latest version because I can't find yours in
> /incoming
Odd...
First the diff, this is diff between 0.54-mdk1 in cooker and my
0.54-0.3mdk (re-added the smiley patch) spec
diffstat gaim.patch
gaim.spec | 85
+++++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 11 deletions(-)
--- gaim.orig.spec Sun Mar 24 23:01:35 2002
+++ gaim.spec Mon Mar 25 00:53:23 2002
@@ -1,11 +1,12 @@
%define name gaim
%define version 0.54
-%define release 1mdk
+%define release 0.3mdk
%define prefix /usr
+%define sysconfdir /etc
%define perl_version %(rpm -q --qf '%%{VERSION}' perl)
-Summary: A client compatible with AOL's 'Instant Messenger'
+Summary: A GTK+ based multiprotocol instant messaging client
Name: %{name}
Version: %{version}
@@ -23,14 +24,41 @@
BuildRoot: %{_tmppath}/%{name}-buildroot
%description
-Gaim allows you to talk to anyone using AOL's Instant Messenger service (you
-can sign up at http://www.aim.aol.com).
+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 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.
+It contains many of the same features as AOL's IM client while at
+the same time incorporating many new features.
+
+Gaim also contains a multiple connection feature which consists of
+protocol plugins. These plugins allow you to use gaim to connect
+to other chat services such as Yahoo!, ICQ, and IRC.
+
+%package applet
+Summary: A GNOME based multiprotocol instant messaging client
+Group: Applications/Internet
+Requires: gtk+ >= 1.2.5 libpanel-applet0 >= 1.4.0.6
+BuildRequires: gtk+-devel libpanel_applet0-devel esound-devel perl-devel
+
+%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.
+
+Gaim also contains a multiple connection feature which consists of
+protocol plugins. These plugins allow you to use gaim to connect
+to other chat services such as Yahoo!, ICQ, and IRC.
+
+The applet sits in your Gnome panel. It has all the same functionality
+as the regular application but takes less desktop space.
%prep
@@ -40,11 +68,16 @@
bzcat %{SOURCE1} | tar xvf -
%build
-%configure --disable-static
+%configure2_5x --disable-gnome --disable-artsc
%make
+if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+%makeinstall bitsdata=$RPM_BUILD_ROOT/%{_datadir}
+bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir}
+%make -C src mostlyclean-compile
+%configure2_5x --enable-distrib --disable-artsc
+%make -C src gaim_applet
%install
-rm -rf $RPM_BUILD_ROOT
%makeinstall bitsdata=$RPM_BUILD_ROOT/%{_datadir}
bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir}
#icons
@@ -88,12 +121,41 @@
%{_miconsdir}/%{name}.xpm
%{_liconsdir}/%{name}.xpm
+%files applet
+%defattr(-,root,root)
+%attr(755,root,root) %{prefix}/bin/gaim_applet
+%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog
+plugins/PERL-HOWTO HACKING
+%{prefix}/lib/gaim/*
+%{prefix}/share/locale/*/*/*
+%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim/*
+%{prefix}/share/gnome/apps/Internet/gaim.desktop
+%{sysconfdir}/CORBA/servers/*
+%{prefix}/share/applets/Network/*
+
%clean
rm -r $RPM_BUILD_ROOT
%changelog
-* Mon Mar 25 2002 Geoffrey Lee <[EMAIL PROTECTED]> 0.54-1mdk
-- New and shiny 0.54.
+* Mon Mar 25 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.3mdk
+- Place smiley patch back in
+
+* Tue Mar 19 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.2mdk
+- Change summary for main && applet (Thx to David Walser)
+- Add Requires libpanel-applet0 >= 1.4.0.6 for applet
+- Add BuildRequires for applet
+
+* Mon Mar 18 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.1mdk
+- Updated gaim
+- Changed summary
+- Changed description
+- Added sub package applet (gaim_applet)
+- Use --disable-gnome --disable-artsc for compatibility reasons on %configure
+ in main
+- Remove smiley-patch (broken anyway)
+- use %configure2_5x
+- Removed --disable-static from %configure2_5x (breaks gaim_applet)
+- Define sysconfdir /etc
* Fri Feb 1 2002 Adrien Demarez <[EMAIL PROTECTED]> 0.51-1mdk
- Updated gaim
> but anyway if you tell me what you have done I can merge them in.
>
>From the spec file it's pretty easy to see.
>
> > - Changed summary
>
> what have you changed?
-Summary: A client compatible with AOL's 'Instant Messenger'
+Summary: A GTK+ based multiprotocol instant messaging client
Be specific about what GAIM really is now.
>
> > - Changed description
>
>
Just towards the bottom of the description you can see that it's just
being more specific about what GAIM does utilize/support.
>
>
> > - Added sub package applet (gaim_applet)
>
gaim_applet is the only way to go if you're GNOME user :) Not fair to
GNOME users to only have the option of using plain old gaim.
> can you send spec diff (preferably against the one in cooker)
Above and attached (also attached, my spec file.)
> > - Use --disable-gnome --disable-artsc for compatibility reasons on
>
>
> ok, but why?
Disable GNOME bits for KDE user compatibility reasons, disable artsc
bits simply because it's KDE centric, and the interoperability, so why
bloat gaim for GNOME users? And the same for KDE users? Though, it is
harmless to enable both of these, that's just MHO.
>
> > %configure
> > in main
> > - Remove smiley-patch (broken anyway)
>
> no. It's useful but :/ is broke so I'm too lazy to fix this,and I removed
> just that one but kept the smiley patch.
Hmmm yes, I was too lazy to even look at it :) Though I wasn't aware
that ':/' was the only thing broken, so revert that. Fix seems trivial,
but I don't have time to look at gtkihtml.c right now : P
> > - use %configure2_5x
>
>
> is %configure not ok?
part of the %configure2_5x macro :
'--build %{_target_platform} --host %{_target_platform} --target %{_target_platform}'
So yeah, %configure is fine, I'm just anal, and like to use
%configure2_5x : )
I'm going to upload my 0.3mdk to /incoming now
Tashi Delek :)
--
Bryan Paxton
Public PGP key: http://www.deadhorse.net/bpaxton.gpg
Trying, the volition devoid of action, this is idleness.
Doing, the volition replete in motion, a process.
Being that all things are impermanent, this process is constant.
If one realizes such, the process is in all actuality, one step.
A motion that can not be reversed, but may be halted.
Both ways does this sway.
--- gaim.orig.spec Sun Mar 24 23:01:35 2002
+++ gaim.spec Mon Mar 25 00:53:23 2002
@@ -1,11 +1,12 @@
%define name gaim
%define version 0.54
-%define release 1mdk
+%define release 0.3mdk
%define prefix /usr
+%define sysconfdir /etc
%define perl_version %(rpm -q --qf '%%{VERSION}' perl)
-Summary: A client compatible with AOL's 'Instant Messenger'
+Summary: A GTK+ based multiprotocol instant messaging client
Name: %{name}
Version: %{version}
@@ -23,14 +24,41 @@
BuildRoot: %{_tmppath}/%{name}-buildroot
%description
-Gaim allows you to talk to anyone using AOL's Instant Messenger service (you
-can sign up at http://www.aim.aol.com).
+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 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.
+It contains many of the same features as AOL's IM client while at
+the same time incorporating many new features.
+
+Gaim also contains a multiple connection feature which consists of
+protocol plugins. These plugins allow you to use gaim to connect
+to other chat services such as Yahoo!, ICQ, and IRC.
+
+%package applet
+Summary: A GNOME based multiprotocol instant messaging client
+Group: Applications/Internet
+Requires: gtk+ >= 1.2.5 libpanel-applet0 >= 1.4.0.6
+BuildRequires: gtk+-devel libpanel_applet0-devel esound-devel perl-devel
+
+%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.
+
+Gaim also contains a multiple connection feature which consists of
+protocol plugins. These plugins allow you to use gaim to connect
+to other chat services such as Yahoo!, ICQ, and IRC.
+
+The applet sits in your Gnome panel. It has all the same functionality
+as the regular application but takes less desktop space.
%prep
@@ -40,11 +68,16 @@
bzcat %{SOURCE1} | tar xvf -
%build
-%configure --disable-static
+%configure2_5x --disable-gnome --disable-artsc
%make
+if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
+mkdir -p $RPM_BUILD_ROOT%{prefix}
+%makeinstall bitsdata=$RPM_BUILD_ROOT/%{_datadir} bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir}
+%make -C src mostlyclean-compile
+%configure2_5x --enable-distrib --disable-artsc
+%make -C src gaim_applet
%install
-rm -rf $RPM_BUILD_ROOT
%makeinstall bitsdata=$RPM_BUILD_ROOT/%{_datadir} bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir}
#icons
@@ -88,12 +121,41 @@
%{_miconsdir}/%{name}.xpm
%{_liconsdir}/%{name}.xpm
+%files applet
+%defattr(-,root,root)
+%attr(755,root,root) %{prefix}/bin/gaim_applet
+%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog plugins/PERL-HOWTO HACKING
+%{prefix}/lib/gaim/*
+%{prefix}/share/locale/*/*/*
+%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim/*
+%{prefix}/share/gnome/apps/Internet/gaim.desktop
+%{sysconfdir}/CORBA/servers/*
+%{prefix}/share/applets/Network/*
+
%clean
rm -r $RPM_BUILD_ROOT
%changelog
-* Mon Mar 25 2002 Geoffrey Lee <[EMAIL PROTECTED]> 0.54-1mdk
-- New and shiny 0.54.
+* Mon Mar 25 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.3mdk
+- Place smiley patch back in
+
+* Tue Mar 19 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.2mdk
+- Change summary for main && applet (Thx to David Walser)
+- Add Requires libpanel-applet0 >= 1.4.0.6 for applet
+- Add BuildRequires for applet
+
+* Mon Mar 18 2002 Bryan Paxton <[EMAIL PROTECTED]> 0.54-0.1mdk
+- Updated gaim
+- Changed summary
+- Changed description
+- Added sub package applet (gaim_applet)
+- Use --disable-gnome --disable-artsc for compatibility reasons on %configure
+ in main
+- Remove smiley-patch (broken anyway)
+- use %configure2_5x
+- Removed --disable-static from %configure2_5x (breaks gaim_applet)
+- Define sysconfdir /etc
* Fri Feb 1 2002 Adrien Demarez <[EMAIL PROTECTED]> 0.51-1mdk
- Updated gaim
