diff --git a/.cvsignore b/.cvsignore index 53025a7..87b57d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bitlbee-1.0.3.tar.gz +bitlbee-1.0.4-fedora.tar.gz diff --git a/bitlbee-1.0.3-cflags.patch b/bitlbee-1.0.3-cflags.patch deleted file mode 100644 index c54b3a6..0000000 --- a/bitlbee-1.0.3-cflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -Bug #171: [PATCH] Environment variable CFLAGS isn't honored ---------------------------------------+------------------------------------- - Reporter: robert@fedoraproject.org | Owner: - Type: defect | Status: new - Priority: normal | Milestone: -Component: BitlBee | Version: 1.0.3 - Keywords: | Irc_client: Client-independent - Os: Linux | Os_version: ---------------------------------------+------------------------------------- -BitlBee currently doesn't honor passed CFLAGS, neither in 'CFLAGS="foo" -./configure' nor at 'make CFLAGS="foo"'. Last one will break BitlBee while -compiling completely. Following patch resolves the issue (especially for -vendors like Fedora, Mandrake etc). Thanks to wilmer and lucumo for -figgering out a suitable and working solution. - -Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/171 - ---- bitlbee-1.0.3/configure 2006-06-24 16:00:43.000000000 +0200 -+++ bitlbee-1.0.3/configure.rsc 2006-06-26 16:03:59.000000000 +0200 -@@ -111,7 +111,11 @@ - echo 'DEBUG=1' >> Makefile.settings - echo '#define DEBUG' >> config.h - else -- echo 'CFLAGS=-O3' >> Makefile.settings -+ if [ -n "$CFLAGS" ]; then -+ echo CFLAGS="$CFLAGS" >> Makefile.settings -+ else -+ echo CFLAGS="-O3" >> Makefile.settings -+ fi - fi - - echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings diff --git a/bitlbee-1.0.3-socklen.patch b/bitlbee-1.0.3-socklen.patch deleted file mode 100644 index c0b0bf2..0000000 --- a/bitlbee-1.0.3-socklen.patch +++ /dev/null @@ -1,34 +0,0 @@ -Bug #200: bitlbee.c:41: warning: passing argument 3 of 'accept' from - incompatible pointer type ---------------------------------------+------------------------------------- - Reporter: anonymous | Owner: - Type: defect | Status: new - Priority: minor | Milestone: -Component: BitlBee | Version: 1.0.3 - Keywords: | Irc_client: Client-independent - Os: Public server | Os_version: Fedora Core 4 ---------------------------------------+------------------------------------- -on x86_64 I get: - -bitlbee.c:41: warning: passing argument 3 of 'accept' from incompatible -pointer type - -This is because the type for size has been set to size_t instead of socklen_t. - -Setting it to socklen_t resolved this for me. - -paul@cypherpunks.ca - -Further information & updates: http://bugs.bitlbee.org/bitlbee/ticket/200 - ---- bitlbee-1.0.3/bitlbee.c 2006-06-24 16:00:43.000000000 +0200 -+++ bitlbee-1.0.3/bitlbee.c.socklen 2006-09-23 22:42:59.000000000 +0200 -@@ -35,7 +35,7 @@ - - gboolean bitlbee_io_new_client( GIOChannel *source, GIOCondition condition, gpointer data ) - { -- size_t size = sizeof( struct sockaddr_in ); -+ socklen_t size = sizeof( struct sockaddr_in ); - struct sockaddr_in conn_info; - int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, - &size ); diff --git a/bitlbee.spec b/bitlbee.spec index 2733c8e..13a7657 100644 --- a/bitlbee.spec +++ b/bitlbee.spec @@ -1,16 +1,17 @@ Summary: IRC to other chat networks gateway Name: bitlbee -Version: 1.0.3 -Release: 6%{?dist} -License: GPL +Version: 1.0.4 +Release: 1%{?dist} +License: GPLv2+ and MIT Group: System Environment/Daemons URL: http://www.bitlbee.org/ -Source0: http://get.bitlbee.org/src/%{name}-%{version}.tar.gz +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 Source1: bitlbee.xinetd -Patch0: bitlbee-1.0.3-cflags.patch -Patch1: bitlbee-1.0.3-socklen.patch Requires: xinetd -Requires(pre): /usr/sbin/useradd +Requires(pre): shadow-utils Requires(preun): /sbin/service BuildRequires: glib2-devel, libxslt %if 0%{?rhl}%{?fedora}%{?rhel} @@ -23,12 +24,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n %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 MSN/ICQ/Jabber. +networks like ICQ, MSN, Jabber or Yahoo! %prep %setup -q -%patch0 -p1 -b .cflags -%patch1 -p1 -b .socklen perl -pi.make -e ' s|\$\(BINDIR\)|\$(sbindir)|g; @@ -65,7 +64,9 @@ install -D -m 644 %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.con install -m 644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ %pre -%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -M -c "BitlBee User" %{name} > /dev/null 2>&1 || : +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} +exit 0 %preun if [ $1 -eq 0 ]; then @@ -88,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name} %changelog +* Wed Aug 29 2007 Robert Scheck 1.0.4-1 +- Upgrade to 1.0.4 +- Updated the license tag according to the guidelines + * Mon May 07 2007 Robert Scheck 1.0.3-6 - Rebuilt diff --git a/sources b/sources index ab41a85..4e0a9f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e46682d54cbd6265dd4436b3b6838d63 bitlbee-1.0.3.tar.gz +00e29229b896031ef00880c1787a5dbd bitlbee-1.0.4-fedora.tar.gz