rpms/bitlbee/F-7 bitlbee-1.2-gmalloc.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 bitlbee.spec, 1.3, 1.4 sources, 1.3, 1.4

[Robert Scheck (robert)]

Author: robert

Update of /cvs/extras/rpms/bitlbee/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23319/F-7

Modified Files:
	.cvsignore bitlbee.spec sources 
Added Files:
	bitlbee-1.2-gmalloc.patch 
Log Message:
Upgrade to 1.2 (#439047, thanks to Matěj Cepl)


bitlbee-1.2-gmalloc.patch:

--- NEW FILE bitlbee-1.2-gmalloc.patch ---
BitlBee 1.2 doesn't compile on Red Hat Enterprise Linux 4 and systems based
on it. Build fails with message 'In file included from arc.c:48: arc.h:33:
error: syntax error before "struct"' or similar. Fixed at upstream (devel)
by Wilmer van der Gaast at 2008-04-05 13:54. Newer releases won't need this
patch any longer.

Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/375

--- bitlbee-1.2/lib/arc.h		2008-03-16 14:07:52.000000000 +0100
+++ bitlbee-1.2/lib/arc.h.gmalloc	2008-04-05 14:33:57.000000000 +0200
@@ -30,6 +30,10 @@
 	unsigned char i, j;
 };
 
+#ifndef G_GNUC_MALLOC
+#define G_GNUC_MALLOC
+#endif
+
 G_GNUC_MALLOC struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char arc_getbyte( struct arc_state *st );
 int arc_encode( char *clear, int clear_len, unsigned char **crypt, char *password, int pad_to );


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Aug 2007 19:48:58 -0000	1.3
+++ .cvsignore	15 Apr 2008 18:04:17 -0000	1.4
@@ -1 +1 @@
-bitlbee-1.0.4-fedora.tar.gz
+bitlbee-1.2.tar.gz


Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-7/bitlbee.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bitlbee.spec	29 Aug 2007 19:48:58 -0000	1.3
+++ bitlbee.spec	15 Apr 2008 18:04:17 -0000	1.4
@@ -1,19 +1,17 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.0.4
+Version:           1.2
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
-Source0:           http://home.parabolic.nl/~maurits/src/%{name}-%{version}-fedora.tar.gz
-# Bitlbee 1.0.5 or 1.1 will get the correct source again, 1.0.4 was
-# repackaged to match with the Fedora Packaging License Guideline.
-#Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
+Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
+Patch0:            bitlbee-1.2-gmalloc.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
 Requires(preun):   /sbin/service
-BuildRequires:     glib2-devel, libxslt
+BuildRequires:     glib2-devel >= 2.4, libxslt, %{_includedir}/bind/arpa/nameser.h
 %if 0%{?rhl}%{?fedora}%{?rhel}
 BuildRequires:     gnutls-devel
 %else
@@ -28,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gmalloc
 
 perl -pi.make -e '
                 s|\$\(BINDIR\)|\$(sbindir)|g;
@@ -45,12 +44,14 @@
         --datadir=%{_datadir}/%{name} \
         --config=%{_localstatedir}/lib/%{name} \
         --strip=0 \
+        --plugins=1 \
 %if 0%{?rhl}%{?fedora}%{?rhel}
         --ssl=gnutls
 %else
         --ssl=openssl
 %endif
 
+sed -i 's/EFLA.*libres.*/EFLAGS+=-lbind/' Makefile.settings
 make %{?_smp_mflags}
 
 %install
@@ -63,6 +64,12 @@
 install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
 install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
+# Convert everything to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o doc/CHANGES.utf8 doc/CHANGES
+mv -f doc/CHANGES.utf8 doc/CHANGES
+iconv -f iso-8859-1 -t utf-8 -o doc/CREDITS.utf8 doc/CREDITS
+mv -f doc/CREDITS.utf8 doc/CREDITS
+
 %pre
 getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
 getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "BitlBee User" %{name}
@@ -89,6 +96,12 @@
 %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Tue Apr 15 2008 Robert Scheck <robert at fedoraproject.org> 1.2-1
+- Upgrade to 1.2 (#439047, thanks to Matěj Cepl)
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 1.0.4-2
+- Rebuilt against gcc 4.3
+
 * Wed Aug 29 2007 Robert Scheck <robert at fedoraproject.org> 1.0.4-1
 - Upgrade to 1.0.4
 - Updated the license tag according to the guidelines


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 19:48:58 -0000	1.3
+++ sources	15 Apr 2008 18:04:17 -0000	1.4
@@ -1 +1 @@
-00e29229b896031ef00880c1787a5dbd  bitlbee-1.0.4-fedora.tar.gz
+15d969391dd9bbbc9bb0d397b545a99c  bitlbee-1.2.tar.gz