rpms/licq/devel licq-1.3.5-gcc43.patch, NONE, 1.1 licq.spec, 1.22, 1.23 sources, 1.6, 1.7 licq-1.3.4-new_user_auth.patch, 1.1, NONE

[Jiří Moskovčák (jmoskovc)]

Author: jmoskovc

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27977

Modified Files:
	licq.spec sources 
Added Files:
	licq-1.3.5-gcc43.patch 
Removed Files:
	licq-1.3.4-new_user_auth.patch 
Log Message:
New version, some fixes to make licq to build with gcc 4.3


licq-1.3.5-gcc43.patch:

--- NEW FILE licq-1.3.5-gcc43.patch ---
--- licq-1.3.5/src/fifo.cpp	2007-09-28 22:11:35.000000000 +0200
+++ licq-1.3.5_mzk/src/fifo.cpp	2008-02-14 11:15:53.000000000 +0100
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <climits>
 #include "time-fix.h"
 
 #ifdef HAVE_ERRNO_H
--- licq-1.3.5/plugins/msn/configure.ac.gcc43	2006-10-20 23:02:34.000000000 +0200
+++ licq-1.3.5/plugins/msn/configure.ac	2008-02-14 11:54:03.000000000 +0100
@@ -53,7 +53,7 @@
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 
-AC_CHECK_HEADER(vector.h,,
+AC_CHECK_HEADER(vector,,
   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
 
 AC_LANG_RESTORE
--- licq-1.3.5_mzk/plugins/icqnd-0.1.9.6/src/main.cpp	2006-08-14 19:59:42.000000000 +0200
+++ licq-1.3.5/plugins/icqnd-0.1.9.6/src/main.cpp	2008-02-14 13:06:37.000000000 +0100
@@ -43,6 +43,8 @@
 #include <sys/time.h>
 #include <gtk/gtk.h>
 
+#include <locale>
+
 int guiArgc; 
 char **guiArgv;
 
--- licq-1.3.5/plugins/auto-reply/configure.ac_gcc43	2006-10-20 23:02:34.000000000 +0200
+++ licq-1.3.5/plugins/auto-reply/configure.ac	2008-02-14 13:17:43.000000000 +0100
@@ -46,7 +46,7 @@
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 
-AC_CHECK_HEADER(vector.h,,
+AC_CHECK_HEADER(vector,,
   AC_MSG_ERROR(You need to have the libstdc++ headers installed))
 
 AC_LANG_RESTORE
--- licq-1.3.5/plugins/auto-reply/src/autoreply.cpp_gcc43	2006-07-15 15:10:26.000000000 +0200
+++ licq-1.3.5/plugins/auto-reply/src/autoreply.cpp	2008-02-14 13:30:01.000000000 +0100
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <signal.h>
+#include <climits>
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #else


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- licq.spec	11 Dec 2007 13:15:39 -0000	1.22
+++ licq.spec	15 Feb 2008 09:45:51 -0000	1.23
@@ -1,6 +1,6 @@
 Name: licq
-Version: 1.3.4
-Release: 10%{?dist}
+Version: 1.3.5
+Release: 1%{?dist}
 License: GPL
 Source0: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/icqnd/icqnd-0.1.9.6.tar.bz2
@@ -14,7 +14,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libXScrnSaver-devel
 BuildRequires: gettext, automake, libtool
-Patch0: licq-1.3.4-new_user_auth.patch
+Patch0: licq-1.3.5-gcc43.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .new_user_auth.patch
 tar -C plugins -xjf %{SOURCE1}
+%patch0 -p1 -b .gcc43.patch
 
 #remove cvs stuff
 rm -rf `find . -name CVS`
@@ -116,6 +116,7 @@
   %configure --libdir=%{_libdir}/
   make
 cd ../msn
+  autoconf
   %configure --libdir=%{_libdir}/
   make
 cd ../icqnd-0.1.9.6
@@ -126,6 +127,7 @@
     --with-licq-includes=%{_builddir}/%{buildsubdir}/include
   make
 cd ../auto-reply
+  autoconf
   %configure --libdir=%{_libdir}/
   make
 
@@ -224,6 +226,10 @@
 %doc plugins/auto-reply/{README,licq_autoreply.conf,examples}
 
 %changelog
+* Thu Feb 14 2008 Jiri Moskovcak <jmoskovc at redhat.com> 1.3.5-1
+- new version
+- few minor fixes to make licq compile with gcc 4.3
+
 * Tue Dec 11 2007 Jiri Moskovcak <jmoskovc at redhat.com> 1.3.4-10
 - spec file cleanup
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Feb 2007 18:13:40 -0000	1.6
+++ sources	15 Feb 2008 09:45:51 -0000	1.7
@@ -1,2 +1 @@
-57d77adca3b486958fed04412296c60b  icqnd-0.1.9.6.tar.bz2
-34a51541173a2ba453b5984b52bfa489  licq-1.3.4.tar.gz
+17ec100b7775deba5545c3909281c945  licq-1.3.5.tar.gz


--- licq-1.3.4-new_user_auth.patch DELETED ---