rpms/micq/F-7 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE, 1.1 sources, 1.1, 1.2
Ján ONDREJ (ondrejj)
fedora-extras-commits at redhat.com
Fri Sep 7 05:44:18 UTC 2007
- Previous message (by thread): rpms/micq/devel micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/micq/FC-6 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ondrejj
Update of /cvs/pkgs/rpms/micq/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32355/F-7
Modified Files:
sources
Added Files:
micq-glibc-open.patch micq.spec
Log Message:
mICQ spec, patch and source file
micq-glibc-open.patch:
--- NEW FILE micq-glibc-open.patch ---
--- micq-0.5.4.2/src/cmd_user.c.open 2007-07-06 08:10:12.000000000 +0900
+++ micq-0.5.4.2/src/cmd_user.c 2007-09-05 23:30:20.000000000 +0900
@@ -4008,7 +4008,7 @@
rl_printf (i18n (2081, " at %p parent %p assoc %p\n"), connl, connl->parent, connl->assoc);
#endif
rl_printf (i18n (2454, " open %p reconn %p close %p err %p dispatch %p\n"),
- connl->open, connl->reconnect, connl->close, connl->error, connl->dispatch);
+ (connl->open), connl->reconnect, connl->close, connl->error, connl->dispatch);
free (t1);
free (t2);
free (t3);
@@ -4052,13 +4052,13 @@
s_repl (&connl->passwd, targs);
if (connl->connect & CONNECT_OK)
rl_printf (i18n (2601, "Connection for %s is already open.\n"), connl->screen);
- else if (!connl->open)
+ else if (!(connl->open))
rl_printf (i18n (2602, "Don't know how to open connection type %s for %s.\n"),
ConnectionType (connl), connl->screen);
else if (!connl->passwd || !*connl->passwd)
rl_printf (i18n (2688, "No password given for %s.\n"), connl->screen);
else
- connl->open (connl);
+ (connl->open) (connl);
break;
case 3:
--- micq-0.5.4.2/src/file_util.c.open 2007-04-18 07:03:26.000000000 +0900
+++ micq-0.5.4.2/src/file_util.c 2007-09-05 23:25:26.000000000 +0900
@@ -66,7 +66,7 @@
if (servertype == TYPE_SERVER)
{
conn = ConnectionC (servertype);
- conn->open = &ConnectionInitServer;
+ (conn->open) = &ConnectionInitServer;
conn->flags |= CONN_AUTOLOGIN;
conn->pref_server = strdup ("login.icq.com");
@@ -101,7 +101,7 @@
const char *serverpart = strchr (user, '@') + 1;
conn = ConnectionC (servertype);
- conn->open = &ConnectionInitXMPPServer;
+ (conn->open) = &ConnectionInitXMPPServer;
conn->flags |= CONN_AUTOLOGIN;
if (!strcmp (serverpart, "gmail.com") || !strcmp (serverpart, "gmail.com"))
@@ -138,7 +138,7 @@
else if (servertype == TYPE_MSN_SERVER)
{
conn = ConnectionC (servertype);
- conn->open = &ConnectionInitMSNServer;
+ (conn->open) = &ConnectionInitMSNServer;
conn->flags |= CONN_AUTOLOGIN;
conn->pref_server = strdup (strchr (user, '@') + 1);
@@ -310,7 +310,7 @@
}
#ifdef ENABLE_REMOTECONTROL
conns = ConnectionC (TYPE_REMOTE);
- conns->open = &RemoteOpen;
+ (conns->open) = &RemoteOpen;
conns->flags |= CONN_AUTOLOGIN;
conns->pref_server = strdup ("scripting");
conns->server = strdup (conns->pref_server);
@@ -1231,35 +1231,35 @@
switch (conn->type)
{
case TYPE_SERVER:
- conn->open = &ConnectionInitServer;
+ (conn->open) = &ConnectionInitServer;
break;
case TYPE_SERVER_OLD:
- conn->open = &ConnectionInitServerV5;
+ (conn->open) = &ConnectionInitServerV5;
break;
#ifdef ENABLE_MSN
case TYPE_MSN_SERVER:
- conn->open = &ConnectionInitMSNServer;
+ (conn->open) = &ConnectionInitMSNServer;
break;
#endif
#ifdef ENABLE_XMPP
case TYPE_XMPP_SERVER:
- conn->open = &ConnectionInitXMPPServer;
+ (conn->open) = &ConnectionInitXMPPServer;
break;
#endif
#ifdef ENABLE_PEER2PEER
case TYPE_MSGLISTEN:
- conn->open = &ConnectionInitPeer;
+ (conn->open) = &ConnectionInitPeer;
break;
#endif
#ifdef ENABLE_REMOTECONTROL
case TYPE_REMOTE:
- conn->open = &RemoteOpen;
+ (conn->open) = &RemoteOpen;
connr = conn;
break;
#endif
default:
conn->type = 0;
- conn->open = NULL;
+ (conn->open) = NULL;
break;
}
if (format < 2 && !conn->contacts && conn->type & TYPEF_SERVER)
@@ -1275,7 +1275,7 @@
if (!connr)
{
connr = ConnectionC (TYPE_REMOTE);
- connr->open = &RemoteOpen;
+ (connr->open) = &RemoteOpen;
connr->pref_server = strdup ("scripting");
connr->parent = NULL;
connr->server = strdup (connr->pref_server);
--- micq-0.5.4.2/src/micq.c.open 2007-05-30 07:57:38.000000000 +0900
+++ micq-0.5.4.2/src/micq.c 2007-09-05 23:20:35.000000000 +0900
@@ -467,7 +467,7 @@
}
for (i = 0; (conn = ConnectionNr (i)); i++)
- if (conn->open && conn->flags & CONN_AUTOLOGIN)
+ if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
if (conn->type & TYPEF_ANY_SERVER)
conn->status = conn->pref_status;
@@ -505,7 +505,7 @@
conn->status = arg_ss;
if (arg_p)
s_repl (&conn->passwd, arg_p);
- if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = conn->open (conn)))
+ if (conn->passwd && *conn->passwd && (!arg_s || arg_ss != ims_offline) && (loginevent = (conn->open) (conn)))
QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
&CmdUserCallbackTodo);
@@ -538,7 +538,7 @@
if (!uingiven)
for (i = 0; (conn = ConnectionNr (i)); i++)
- if (conn->open && conn->flags & CONN_AUTOLOGIN)
+ if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
if (conn->type & TYPEF_ANY_SERVER)
if (!conn->passwd || !*conn->passwd)
{
@@ -554,17 +554,17 @@
if (!uingiven)
{
for (i = 0; (conn = ConnectionNr (i)); i++)
- if (conn->open && conn->flags & CONN_AUTOLOGIN)
+ if ((conn->open) && conn->flags & CONN_AUTOLOGIN)
{
if (conn->type & TYPEF_ANY_SERVER)
{
- if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = conn->open (conn)))
+ if (conn->passwd && *conn->passwd && conn->status != ims_offline && (loginevent = (conn->open) (conn)))
QueueEnqueueDep (conn, QUEUE_MICQ_COMMAND, 0, loginevent, NULL, conn->cont,
OptSetVals (NULL, CO_MICQCOMMAND, arg_C.len ? arg_C.txt : "eg", 0),
&CmdUserCallbackTodo);
}
else
- conn->open (conn);
+ (conn->open) (conn);
}
}
s_done (&arg_C);
--- micq-0.5.4.2/src/msn_base.cpp.open 2007-05-12 22:22:03.000000000 +0900
+++ micq-0.5.4.2/src/msn_base.cpp 2007-09-05 23:28:41.000000000 +0900
@@ -101,7 +101,7 @@
cb->serv = serv;
MyCallbackSetMICQ (serv, cb);
- serv->open = &ConnectionInitMSNServer;
+ (serv->open) = &ConnectionInitMSNServer;
serv->reconnect = &MsnCallbackReconn;
serv->error = &MsnCallbackError;
serv->close = &MsnCallbackClose;
--- micq-0.5.4.2/src/oscar_register.c.open 2007-06-11 04:32:28.000000000 +0900
+++ micq-0.5.4.2/src/oscar_register.c 2007-09-05 23:27:43.000000000 +0900
@@ -154,10 +154,10 @@
serv->flags |= CONN_CONFIGURED;
if (serv->flags & CONN_WIZARD)
{
- assert (serv->open);
+ assert ((serv->open));
#ifdef ENABLE_PEER2PEER
assert (serv->assoc);
- assert (serv->assoc->open);
+ assert ((serv->assoc->open));
serv->assoc->flags |= CONN_AUTOLOGIN;
#endif
serv->flags |= CONN_AUTOLOGIN;
@@ -172,9 +172,9 @@
if (Save_RC () == -1)
rl_print (i18n (1679, "Sorry saving your personal reply messages went wrong!\n"));
#ifdef ENABLE_PEER2PEER
- serv->assoc->open (serv->assoc);
+ (serv->assoc->open) (serv->assoc);
#endif
- serv->open (serv);
+ (serv->open) (serv);
}
else
rl_print (i18n (2518, "You need to 'save' to write your new UIN to disc.\n"));
--- NEW FILE micq.spec ---
Summary: Text/line based ICQ client with many features
Name: micq
Version: 0.5.4.2
Release: 4%{?dist}
Source: http://www.micq.org/source/%{name}-%{version}.tgz
Patch1: micq-glibc-open.patch
URL: http://www.micq.org/
Group: Applications/Internet
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: gnutls-devel
BuildRequires: tcl-devel
BuildRequires: libotr-devel
BuildRequires: enca
%description
mICQ is a portable, small, yet powerful console based ICQ client. It
supports password changing, auto-away, creation of new accounts, searching,
file transfer, acknowledged messages, SMS, client identification, logging,
scripting, transcoding, multi-UIN usage and other features that makes it a
very complete yet simple internationalized client supporting the current
ICQ v8 protocol.
It has leading support for (ICQ2002+/ICQ Lite/ICQ2go) unicode encoded
messages unreached by other ICQ clones.
A lot of other ICQ clients are based in spirit on mICQ, nevertheless
mICQ is still _the_ console based ICQ client.
%prep
%setup -q -n micq-%{version}
%patch1 -p1
%build
%configure --disable-dependency-tracking --enable-autopackage
make %{?_smp_mflags}
# convert documentation to UTF-8, when possible
# es, fr are 7bit, sr is already UTF8
enconv -L russian -x UTF-8 doc/ru/*
enconv -L slovak -x UTF-8 doc/sk/*
enconv -L ukrainian -x UTF-8 doc/uk/*
for i in doc/de/* doc/pt_BR/* doc/it/*; do
iconv -f iso8859-1 -t UTF-8 $i > $i.tmp
mv -f $i.tmp $i
done
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,0755)
%doc NEWS AUTHORS FAQ README TODO COPYING COPYING-GPLv2
%doc doc/README.i18n doc/README.logformat doc/README.ssl doc/example-micq-event-script
%{_bindir}/*
%{_datadir}/micq
%{_mandir}/man?/*
%lang(de) %{_mandir}/de/man?/*
%lang(es) %{_mandir}/es/man?/*
%lang(fr) %{_mandir}/fr/man?/*
%lang(it) %{_mandir}/it/man?/*
%lang(pt_BR) %{_mandir}/pt_BR/man?/*
%lang(ru) %{_mandir}/ru/man?/*
%lang(sk) %{_mandir}/sk/man?/*
%lang(sr) %{_mandir}/sr/man?/*
%lang(uk) %{_mandir}/uk/man?/*
%changelog
* Thu Sep 06 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-4
- using iconv instead of convmv
* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-3
- added forgotten enca to BuildRequires
- updated description (removed author)
- install keeps file tempstamps
* Wed Sep 05 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-2
- changelog section moved to end of spec file
- compilation condition removed
- paralel compilation support added
- libotr-devel added to BuildRequires to build package on f8 too
- compilation flags updated (-O4 removed)
- man files converted to UTF-8
- added lang macros for man pages
- EVR added to changelog entries
* Sun Aug 26 2007 Jan ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.5.4.2-1
- rpmlint cleanups
* Wed Apr 18 2007 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.3
* Mon Nov 06 2006 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.2
* Sun Jan 16 2006 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.1
* Sun Jun 05 2005 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.4
* Sun Apr 27 2005 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.3
* Sun Apr 24 2005 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.2
* Sun Feb 17 2005 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5.0.1
* Fri Feb 12 2005 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.5
* Sun Dec 5 2004 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.99.9
* Sat Jan 17 2004 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.11
* Mon Oct 6 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.5
* Mon Sep 22 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.4
- fixes remote DoS
* Mon May 13 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.3
* Tue Feb 27 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.2
* Tue Jan 24 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream bug fix release 0.4.10.1
* Tue Jan 07 2003 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.10
* Tue Oct 03 2002 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.4
* Tue Aug 26 2002 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release 0.4.9.3
* Tue Aug 08 2002 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- new upstream release
* Tue Jun 11 2002 Rüdiger Kuhlmann <info at ruediger-kuhlmann.de>
- first RPM
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/micq/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Sep 2007 19:37:59 -0000 1.1
+++ sources 7 Sep 2007 05:43:46 -0000 1.2
@@ -0,0 +1 @@
+ce6f44a335dcc03877e357689ca35489 micq-0.5.4.2.tgz
- Previous message (by thread): rpms/micq/devel micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/micq/FC-6 micq-glibc-open.patch, NONE, 1.1 micq.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list