rpms/bitlbee/F-12 bitlbee-1.2.6-libresolv.patch, 1.1, 1.2 bitlbee.spec, 1.16, 1.17
Robert Scheck
robert at fedoraproject.org
Sun Apr 25 13:13:18 UTC 2010
Author: robert
Update of /cvs/extras/rpms/bitlbee/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11922/F-12
Modified Files:
bitlbee-1.2.6-libresolv.patch bitlbee.spec
Log Message:
- Updated the description to reflect twitter support
- Really fixed the optional libresolv patch this time
bitlbee-1.2.6-libresolv.patch:
Makefile | 2
configure | 6 -
lib/Makefile | 2
lib/misc.c | 53 ------------
lib/misc.h | 9 --
lib/srv.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/srv.h | 38 +++++++++
7 files changed, 294 insertions(+), 65 deletions(-)
Index: bitlbee-1.2.6-libresolv.patch
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-12/bitlbee-1.2.6-libresolv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bitlbee-1.2.6-libresolv.patch 20 Apr 2010 19:41:39 -0000 1.1
+++ bitlbee-1.2.6-libresolv.patch 25 Apr 2010 13:13:18 -0000 1.2
@@ -7,7 +7,7 @@ versions. A few more information and det
Red Hat Bugzilla ID #439047: https://bugzilla.redhat.com/show_bug.cgi?id=439047
--- bitlbee-1.2.6/configure 2010-04-19 15:10:03.000000000 +0200
-+++ bitlbee-1.2.6/configure.libresolv 2010-04-20 21:29:12.000000000 +0200
++++ bitlbee-1.2.6/configure.libresolv 2010-04-25 14:52:00.000000000 +0200
@@ -19,7 +19,7 @@
pidfile='/var/run/bitlbee.pid'
ipcsocket='/var/run/bitlbee.sock'
@@ -31,7 +31,7 @@ Red Hat Bugzilla ID #439047: https://bug
fi
fi
--- bitlbee-1.2.6/lib/Makefile 2010-04-19 15:10:03.000000000 +0200
-+++ bitlbee-1.2.6/lib/Makefile.libresolv 2010-04-20 21:29:57.000000000 +0200
++++ bitlbee-1.2.6/lib/Makefile.libresolv 2010-04-25 14:52:00.000000000 +0200
@@ -9,7 +9,7 @@
-include ../Makefile.settings
@@ -42,7 +42,7 @@ Red Hat Bugzilla ID #439047: https://bug
CFLAGS += -Wall
LFLAGS += -r
--- bitlbee-1.2.6/lib/misc.c 2010-04-19 15:10:03.000000000 +0200
-+++ bitlbee-1.2.6/lib/misc.c.libresolv 2010-04-20 21:31:09.000000000 +0200
++++ bitlbee-1.2.6/lib/misc.c.libresolv 2010-04-25 14:58:57.000000000 +0200
@@ -44,6 +44,7 @@
#ifdef HAVE_RESOLV_A
#include <arpa/nameser.h>
@@ -110,8 +110,8 @@ Red Hat Bugzilla ID #439047: https://bug
/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
char *word_wrap( const char *msg, int line_len )
{
---- bitlbee-1.2.6/lib/misc.h 2009-10-17 17:26:46.000000000 +0200
-+++ bitlbee-1.2.6/lib/misc.h.libresolv 2009-10-17 20:19:03.000000000 +0200
+--- bitlbee-1.2.6/lib/misc.h 2010-04-19 15:10:03.000000000 +0200
++++ bitlbee-1.2.6/lib/misc.h.libresolv 2010-04-25 14:56:02.000000000 +0200
@@ -28,14 +28,7 @@
#include <gmodule.h>
@@ -129,8 +129,8 @@ Red Hat Bugzilla ID #439047: https://bug
G_MODULE_EXPORT void strip_linefeed( gchar *text );
G_MODULE_EXPORT char *add_cr( char *text );
--- bitlbee-1.2.6/lib/srv.c 1970-01-01 01:00:00.000000000 +0100
-+++ bitlbee-1.2.6/lib/srv.c.libresolv 2008-06-28 17:28:45.000000000 +0200
-@@ -0,0 +1,239 @@
++++ bitlbee-1.2.6/lib/srv.c.libresolv 2010-04-25 14:58:24.000000000 +0200
+@@ -0,0 +1,249 @@
+/* srv.c - DNS SRV code
+ * Copyright (C) 2003 Free Software Foundation, Inc.
+ *
@@ -164,6 +164,16 @@ Red Hat Bugzilla ID #439047: https://bug
+#include <string.h>
+#include <time.h>
+
++#ifdef HAVE_RESOLV_A
++# ifdef _WIN32
++# include <windows.h>
++# else
++# include <netinet/in.h>
++# include <arpa/nameser.h>
++# include <resolv.h>
++# endif /* !_WIN32 */
++#endif /* USE_DNS_SRV */
++
+#include "srv.h"
+#include <glib.h>
+#include <glib/gprintf.h>
@@ -371,8 +381,8 @@ Red Hat Bugzilla ID #439047: https://bug
+}
+#endif /* TEST */
--- bitlbee-1.2.6/lib/srv.h 1970-01-01 01:00:00.000000000 +0100
-+++ bitlbee-1.2.6/lib/srv.h.libresolv 2008-06-28 17:29:39.000000000 +0200
-@@ -0,0 +1,49 @@
++++ bitlbee-1.2.6/lib/srv.h.libresolv 2010-04-25 14:58:44.000000000 +0200
+@@ -0,0 +1,38 @@
+/* srv.h
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ *
@@ -395,17 +405,6 @@ Red Hat Bugzilla ID #439047: https://bug
+#ifndef GNUPG_COMMON_SRV_H
+#define GNUPG_COMMON_SRV_H
+
-+#ifdef HAVE_RESOLV_A
-+# ifdef _WIN32
-+# include <windows.h>
-+# else
-+# include <netinet/in.h>
-+# include <arpa/nameser.h>
-+# include <resolv.h>
-+# endif /* !_WIN32 */
-+#endif /* USE_DNS_SRV */
-+
-+
+#ifndef MAXDNAME
+#define MAXDNAME 1025
+#endif
@@ -422,8 +421,8 @@ Red Hat Bugzilla ID #439047: https://bug
+struct ns_srv_reply *srv_lookup(char *service, char *protocol, char *domain);
+
+#endif /*GNUPG_COMMON_SRV_H*/
---- bitlbee-1.2.6/Makefile 2010-03-18 20:56:16.000000000 +0100
-+++ bitlbee-1.2.6/Makefile.libresolv 2010-03-18 23:15:51.000000000 +0100
+--- bitlbee-1.2.6/Makefile 2010-04-19 15:10:03.000000000 +0200
++++ bitlbee-1.2.6/Makefile.libresolv 2010-04-25 14:52:00.000000000 +0200
@@ -10,7 +10,7 @@
# Program variables
Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-12/bitlbee.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bitlbee.spec 20 Apr 2010 19:41:39 -0000 1.16
+++ bitlbee.spec 25 Apr 2010 13:13:18 -0000 1.17
@@ -1,7 +1,7 @@
Summary: IRC to other chat networks gateway
Name: bitlbee
Version: 1.2.6a
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
URL: http://www.bitlbee.org/
@@ -23,7 +23,8 @@ BuildRoot: %{_tmppath}/%{name}-%
%description
Bitlbee is an IRC to other chat networks gateway. Bitlbee can be used as
an IRC server which forwards everything you say to people on other chat
-networks like ICQ, MSN, Jabber or Yahoo!
+networks like ICQ/AIM, MSN, XMPP/Jabber (including Google Talk), Yahoo or
+Twitter!
%package devel
Summary: Development files for bitlbee
@@ -127,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Apr 25 2010 Robert Scheck <robert at fedoraproject.org> 1.2.6a-3
+- Updated the description to reflect twitter support
+- Really fixed the optional libresolv patch this time
+
* Tue Apr 20 2010 Robert Scheck <robert at fedoraproject.org> 1.2.6a-2
- Remerged the optional libresolv patch for 1.2.6a
More information about the scm-commits
mailing list