# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1058727596 0
# Node ID 2cb2a49f4bbecedad30386a7d20ad18a2039d30e
# Parent  9083f92e0d58ace15d2f1f3149bdc2807a61f2ca
[gaim-migrate @ 6740]
Lots of very minor updates:
-dos2unixed PROGRAMMING_NOTES
-added PROGRAMMING_NOTES to make dist, or whatever
-fixed a typo in README.CVS
-updated the version number
-sheared the sheep
-rpm spec file updates from Bjoern Voigt

committer: Tailor Script <tailor@pidgin.im>

diff -r 9083f92e0d58 -r 2cb2a49f4bbe ChangeLog
--- a/ChangeLog	Sun Jul 20 16:19:31 2003 +0000
+++ b/ChangeLog	Sun Jul 20 18:59:56 2003 +0000
@@ -1,12 +1,12 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 0.67
-	* Italian translation updated (Luca Beltrame)
-	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Various bug fixes (larne from irc, Tim Ringenbach, Bjoern 
 	  Voigt)
 	* British English "translation" updated (Sam Halliday)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* German translation updated (Bjoern Voigt)
+	* Italian translation updated (Luca Beltrame)
 
 version 0.66 (07/18/2003):
 	* Freebsd compile fix (Matthew Luckie)
diff -r 9083f92e0d58 -r 2cb2a49f4bbe Makefile.am
--- a/Makefile.am	Sun Jul 20 16:19:31 2003 +0000
+++ b/Makefile.am	Sun Jul 20 18:59:56 2003 +0000
@@ -4,6 +4,7 @@
 		gaim.desktop \
 		gaim2blt.pl \
 		HACKING \
+		PROGRAMMING_NOTES \
 		licq2gaim.pl \
 		setup-gettext \
 		ChangeLog.win32 \
diff -r 9083f92e0d58 -r 2cb2a49f4bbe README.CVS
--- a/README.CVS	Sun Jul 20 16:19:31 2003 +0000
+++ b/README.CVS	Sun Jul 20 18:59:56 2003 +0000
@@ -15,7 +15,7 @@
 to deal with ugly development bugs that we already know about but
 haven't gotten around to fixing.
 
-I you are interested in hacking on gaim, please read README and
+If you are interested in hacking on gaim, please read README and
 HACKING, and take note of the issues in PROGRAMMING_NOTES.  (Note that
 they may be somewhat out of date at times.) Win32 developers, please
 read README.mingw.
diff -r 9083f92e0d58 -r 2cb2a49f4bbe VERSION
--- a/VERSION	Sun Jul 20 16:19:31 2003 +0000
+++ b/VERSION	Sun Jul 20 18:59:56 2003 +0000
@@ -1,1 +1,1 @@
-0.66
+0.67cvs
diff -r 9083f92e0d58 -r 2cb2a49f4bbe configure.ac
--- a/configure.ac	Sun Jul 20 16:19:31 2003 +0000
+++ b/configure.ac	Sun Jul 20 18:59:56 2003 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.66])
+AM_INIT_AUTOMAKE([gaim], [0.67cvs])
 
 AC_PREREQ([2.50])
 
diff -r 9083f92e0d58 -r 2cb2a49f4bbe gaim.spec.in
--- a/gaim.spec.in	Sun Jul 20 16:19:31 2003 +0000
+++ b/gaim.spec.in	Sun Jul 20 18:59:56 2003 +0000
@@ -10,12 +10,12 @@
 Source:     %{name}-%{version}.tar.gz
 Packager:   Rob Flynn <rob@marko.net>
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
-%if %{_vendor} != MandrakeSoft
+%if "%{_vendor}" != "MandrakeSoft"
 Requires:   gtk2 >= 2.0.0
-BuildRequires: libao-devel, gtk2-devel, gtkspell-devel, libtool, audiofile-devel
+BuildRequires: libao-devel, gtk2-devel, gtkspell-devel, libtool, audiofile-devel, pkgconfig
 %else
 Requires:   gtk+2.0 >= 2.0.0
-BuildRequires: libao-devel, libgtk+2.0_0-devel, gtkspell-devel, libtool, audiofile-devel
+BuildRequires: libao-devel, libgtk+2.0_0-devel, gtkspell-devel, libtool, audiofile-devel, pkgconfig
 %endif
 
 %package devel
@@ -71,23 +71,31 @@
 %doc README ChangeLog
 %doc %{_mandir}/man1/*
 
+%dir %{_libdir}/gaim
 %attr(755, root, root) %{_libdir}/gaim/*
 %attr(755, root, root) %{_libdir}/libgaim-remote.so.*
 %{_bindir}/*
 %{_datadir}/locale/*/*/*
 %{_datadir}/pixmaps/*
+%dir %{_datadir}/sounds/gaim
 %{_datadir}/sounds/gaim/*
 %{_datadir}/applications/*
 
 %files devel
 
 %doc plugins/SIGNALS plugins/HOWTO plugins/PERL-HOWTO 
-%doc HACKING TODO
+%doc HACKING PROGRAMMING_NOTES TODO
 
 %attr(755, root, root) %{_libdir}/libgaim-remote.la
+%dir %{_includedir}/gaim-remote
 %{_includedir}/gaim-remote/*.h
 
 %changelog
+* 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.
+- Added Gaim-specific directories to list of Gaim's files.
+
 * Wed Jul 16 2003 Ethan Blanton <eblanton@cs.ohiou.edu>
 - Complete spec file rewrite to take advantage of "new" RPM features
   and make things prettier.