2004-03-03 Laszlo Peter <[email protected]>
authorlaca
Wed, 03 Mar 2004 09:44:46 +0000
changeset 2123 f75c9e92eef2
parent 2122 71b25592be38
child 2124 b39a46c7bc63
2004-03-03 Laszlo Peter <[email protected]> * gaim.spec: fix Solaris build by forcing the use of the glib gettext test macro * patches/gaim-07-gettext.diff: new patch
ChangeLog
gaim.spec
patches/gaim-07-gettext.diff
--- a/ChangeLog	Wed Mar 03 09:41:45 2004 +0000
+++ b/ChangeLog	Wed Mar 03 09:44:46 2004 +0000
@@ -1,3 +1,10 @@
+2004-03-03  Laszlo Peter  <[email protected]>
+
+	* gaim.spec: fix Solaris build by forcing the use of the glib
+	gettext test macro
+
+	* patches/gaim-07-gettext.diff: new patch
+
 2004-03-03  Laszlo Peter  <[email protected]>
 
 	* gnome-media.spec: add libgnomeui dependency
--- a/gaim.spec	Wed Mar 03 09:41:45 2004 +0000
+++ b/gaim.spec	Wed Mar 03 09:44:46 2004 +0000
@@ -18,6 +18,7 @@
 Patch4:         gaim-04-uint_max.diff
 Patch5:         gaim-05-stringref-1.diff
 Patch6:         gaim-06-po-mkinstalldirs.diff
+Patch7:         gaim-07-gettext.diff
 URL:		http://gaim.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 Docdir:		%{_defaultdocdir}/gaim
@@ -41,6 +42,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 libtoolize --force
@@ -77,6 +79,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Mar 03 2004 - <[email protected]>
+- fix Solaris build by forcing the use of the glib gettext test macro
+
 * Fri Feb 20 2004 - <[email protected]>
 - Distro to Cinnabar, fixed patch gaim-06-po-mkinstalldirs.diff
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gaim-07-gettext.diff	Wed Mar 03 09:44:46 2004 +0000
@@ -0,0 +1,17 @@
+--- gaim-0.75/configure.ac	Fri Jan  9 20:50:38 2004
++++ gaim-0.75.hacked/configure.ac	Wed Mar  3 01:15:19 2004
+@@ -30,8 +30,12 @@
+ esac
+ 
+ ALL_LINGUAS="am bg ca cs da de en_GB es fi fr he hi hu it ja ko nl no pl pt_BR pt ro ru sk sr sr@Latn sv vi zh_CN zh_TW"
+-AM_GNU_GETTEXT_VERSION(0.10.40)
+-AM_GNU_GETTEXT
++#AM_GNU_GETTEXT_VERSION(0.10.40)
++AM_GLIB_GNU_GETTEXT
++USE_INCLUDED_LIBINTL=no
++AC_SUBST(USE_INCLUDED_LIBINTL)
++BUILD_INCLUDED_LIBINTL=no
++AC_SUBST(BUILD_INCLUDED_LIBINTL)
+ 
+ dnl we don't use autobreak on cygwin!!
+ dnl AC_CYGWIN