rpms/bitlbee/devel .cvsignore, 1.2, 1.3 bitlbee.spec, 1.2, 1.3 sources, 1.2, 1.3 bitlbee-1.0.3-cflags.patch, 1.1, NONE bitlbee-1.0.3-socklen.patch, 1.1, NONE
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Wed Aug 29 19:42:30 UTC 2007
Author: robert
Update of /cvs/extras/rpms/bitlbee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22685
Modified Files:
.cvsignore bitlbee.spec sources
Removed Files:
bitlbee-1.0.3-cflags.patch bitlbee-1.0.3-socklen.patch
Log Message:
- Upgrade to 1.0.4
- Updated the license tag according to the guidelines
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Oct 2006 07:40:41 -0000 1.2
+++ .cvsignore 29 Aug 2007 19:41:57 -0000 1.3
@@ -1 +1 @@
-bitlbee-1.0.3.tar.gz
+bitlbee-1.0.4-fedora.tar.gz
Index: bitlbee.spec
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/bitlbee.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bitlbee.spec 7 May 2007 19:27:44 -0000 1.2
+++ bitlbee.spec 29 Aug 2007 19:41:57 -0000 1.3
@@ -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 @@
%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 -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 @@
%attr(0700,bitlbee,bitlbee) %dir %{_localstatedir}/lib/%{name}
%changelog
+* 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
+
* Mon May 07 2007 Robert Scheck <robert at fedoraproject.org> 1.0.3-6
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bitlbee/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Oct 2006 07:40:41 -0000 1.2
+++ sources 29 Aug 2007 19:41:57 -0000 1.3
@@ -1 +1 @@
-e46682d54cbd6265dd4436b3b6838d63 bitlbee-1.0.3.tar.gz
+00e29229b896031ef00880c1787a5dbd bitlbee-1.0.4-fedora.tar.gz
--- bitlbee-1.0.3-cflags.patch DELETED ---
--- bitlbee-1.0.3-socklen.patch DELETED ---
More information about the scm-commits
mailing list