[bitlbee] - Upgrade to 3.2 (#912675, thanks to Eike Hein and Rex Dieter) - Use the new systemd macros (#850048
Robert Scheck
robert at fedoraproject.org
Wed Feb 20 01:23:37 UTC 2013
commit 566011bf40202032377a74c1a90d3dd6084836ad
Author: Robert Scheck <robert at fedoraproject.org>
Date: Wed Feb 20 02:23:29 2013 +0100
- Upgrade to 3.2 (#912675, thanks to Eike Hein and Rex Dieter)
- Use the new systemd macros (#850048, thanks to Václav Pavlín)
.gitignore | 1 +
bitlbee-3.0.5-installP.patch | 35 ---
bitlbee-3.0.5-ssl_nss-implement.patch | 506 ---------------------------------
bitlbee-3.2-install.patch | 75 +++++
bitlbee-glib-version.patch | 11 +
bitlbee-libresolv.patch | 7 +
bitlbee-syslibdirs.patch | 11 -
bitlbee.spec | 82 +++---
sources | 2 +-
9 files changed, 143 insertions(+), 587 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 558efeb..a1e8b45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
bitlbee-3.?.?.tar.gz
+bitlbee-3.?.tar.gz
diff --git a/bitlbee-3.2-install.patch b/bitlbee-3.2-install.patch
new file mode 100644
index 0000000..0259433
--- /dev/null
+++ b/bitlbee-3.2-install.patch
@@ -0,0 +1,75 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for bitlbee >= 3.2, which
+uses the $INSTALL variable rather the hardcoded install(1) command. Somehow
+upstream lost or forgot this patch during merges :-/
+
+--- bitlbee-3.2/Makefile 2013-01-07 00:41:11.000000000 +0100
++++ bitlbee-3.2/Makefile.installP 2013-02-19 23:45:11.000000000 +0100
+@@ -90,17 +90,17 @@
+
+ install-bin:
+ mkdir -p $(DESTDIR)$(SBINDIR)
+- install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
++ $(INSTALL) -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+
+ uninstall-bin:
+ rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
+
+ install-dev:
+ mkdir -p $(DESTDIR)$(INCLUDEDIR)
+- install -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
+- for i in $(headers); do install -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
++ $(INSTALL) -m 0644 config.h $(DESTDIR)$(INCLUDEDIR)
++ for i in $(headers); do $(INSTALL) -m 0644 $(_SRCDIR_)$$i $(DESTDIR)$(INCLUDEDIR); done
+ mkdir -p $(DESTDIR)$(PCDIR)
+- install -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
++ $(INSTALL) -m 0644 bitlbee.pc $(DESTDIR)$(PCDIR)
+
+ uninstall-dev:
+ rm -f $(foreach hdr,$(headers),$(DESTDIR)$(INCLUDEDIR)/$(hdr))
+@@ -109,8 +109,8 @@
+
+ install-etc:
+ mkdir -p $(DESTDIR)$(ETCDIR)
+- install -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+- install -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
++ $(INSTALL) -m 0644 $(_SRCDIR_)motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
++ $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
+
+ uninstall-etc:
+ rm -f $(DESTDIR)$(ETCDIR)/motd.txt
+@@ -122,17 +122,17 @@
+ install-plugin-otr:
+ ifdef OTR_PI
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+- install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
++ $(INSTALL) -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+ endif
+
+ install-plugin-skype:
+ ifdef SKYPE_PI
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+- install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
++ $(INSTALL) -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+ mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
+- install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+- install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+- install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
++ $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
++ $(INSTALL) -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
++ $(INSTALL) -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+ make -C protocols/skype install-doc
+ endif
+
+@@ -146,9 +146,9 @@
+ ifdef SYSTEMDSYSTEMUNITDIR
+ ifeq ($(shell id -u),0)
+ mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+- install -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+- install -m 0644 init/bitlbee at .service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+- install -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
++ $(INSTALL) -m 0644 init/bitlbee.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
++ $(INSTALL) -m 0644 init/bitlbee at .service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
++ $(INSTALL) -m 0644 init/bitlbee.socket $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+ else
+ @echo Not root, so not installing systemd files.
+ endif
diff --git a/bitlbee-glib-version.patch b/bitlbee-glib-version.patch
new file mode 100644
index 0000000..d0fa903
--- /dev/null
+++ b/bitlbee-glib-version.patch
@@ -0,0 +1,11 @@
+--- bitlbee-3.2/configure 2013-01-07 00:41:11.000000000 +0100
++++ bitlbee-3.2/configure.glib-version 2013-02-20 01:25:10.000000000 +0100
+@@ -46,7 +46,7 @@
+ arch=`uname -s`
+ cpu=`uname -m`
+
+-GLIB_MIN_VERSION=2.14
++GLIB_MIN_VERSION=2.4
+
+ echo BitlBee configure
+
diff --git a/bitlbee-libresolv.patch b/bitlbee-libresolv.patch
index 4164463..9658346 100644
--- a/bitlbee-libresolv.patch
+++ b/bitlbee-libresolv.patch
@@ -1,3 +1,10 @@
+Patch by Matěj Cepl <mcepl at redhat.com> for bitlbee >= 3.0 to avoid static linking
+to a private glibc function, that is normally visible as libc.so.6(GLIBC_PRIVATE)
+in the binary RPM package. Glibc >= 2.9 allows dynamic linking using -lresolv for
+ns_initparse()/ns_parserr(), but Red Hat Enterprise Linux 5 (including derivates)
+is shipping glibc 2.5. A few more information and details regarding this patch in
+Red Hat Bugzilla ID #439047: https://bugzilla.redhat.com/show_bug.cgi?id=439047
+
diff --git a/configure b/configure
index edc4adb..1b1336d 100755
--- a/configure
diff --git a/bitlbee.spec b/bitlbee.spec
index 13f2aef..3311a29 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -12,37 +12,34 @@
Summary: IRC to other chat networks gateway
Name: bitlbee
-Version: 3.0.5
-Release: 5%{?dist}
+Version: 3.2
+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
Source1: bitlbee.xinetd
Source2: bitlbee-wrapper.h
-# The following two patches were accepted upstream
-# (http://bugs.bitlbee.org/bitlbee/changeset/devel%2C909)
-# it will be available in the next release after 3.0.5
-#
-# 64bit directories should go before 32bit ones.
-Patch0: bitlbee-syslibdirs.patch
-# use install -p instead of plain install ... we should protect time stamps
-Patch1: bitlbee-3.0.5-installP.patch
-# support for old glibc (EL-4, EL-5) which doesn't have ns_initparse and its friends
-Patch2: bitlbee-libresolv.patch
-# Completion of NSS-based SSL implementation. Sent upstream. #714
-# (combined with two tiny fixes from RHBZ #666022)
-Patch4: bitlbee-3.0.5-ssl_nss-implement.patch
+# Always use 'install -p' instead of plain install to protect time stamps
+Patch0: bitlbee-3.2-installP.patch
+# Support for old glibc (EL-5) which doesn't have ns_initparse and its friends
+Patch1: bitlbee-libresolv.patch
+# Patch configure to build with glib2 2.12.3 (EL-5) without twitter support
+Patch2: bitlbee-glib-version.patch
# When the above patches will be consolidated upstream, this should merge
# with Patch1 or Patch2 or something like that
-Patch5: bitlbee-forkdaemon.patch
+Patch3: bitlbee-forkdaemon.patch
# Patch rejected upstream, however we need to keep this, because
# of the SELinux policy is set up for this mode of operation.
-Patch6: bitlbee-systemd.patch
+Patch4: bitlbee-systemd.patch
Requires(pre): shadow-utils
Requires(preun): /sbin/service
+%if 0%{?rhel} == 5
BuildRequires: glib2-devel >= 2.4, libxslt
+%else
+BuildRequires: glib2-devel >= 2.14, libxslt
+%endif
BuildRequires: nss-devel
%if %{with systemd}
BuildRequires: pkgconfig(systemd)
@@ -86,17 +83,15 @@ echo With OTR %with_otr
echo With systemd %with_systemd
%setup -q
%patch0 -p1
-%patch1 -p1
%if 0%{?rhel} == 5
+%patch1 -p1
%patch2 -p1
%endif
-%patch4 -p1
-
%if %{with systemd}
-%patch5 -p1
-%patch6 -p1
+%patch3 -p1
+%patch4 -p1
%endif
%build
@@ -113,6 +108,9 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
--strip=0 \
--plugins=1 \
--ssl=nss \
+%if 0%{?rhel} == 5
+ --twitter=0 \
+%endif
%if %{with otr}
--otr=plugin
%endif
@@ -140,7 +138,7 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
%endif
# Convert everything to UTF-8
-for cnvfile in doc/CHANGES doc/CREDITS ; do
+for cnvfile in doc/CHANGES doc/CREDITS; do
iconv -f iso-8859-1 -t utf-8 -o ${cnvfile}.utf8 ${cnvfile}
touch -c -r ${cnvfile} ${cnvfile}.utf8
mv -f ${cnvfile}.utf8 ${cnvfile}
@@ -153,34 +151,46 @@ exit 0
%post
%if %{with systemd}
+%if 0%{?fedora} >= 18
+ %systemd_post %{name}.service
+%else
if [ $1 -eq 1 ]; then
- # Package install, not upgrade
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ # Package install, not upgrade
+ /bin/systemctl daemon-reload > /dev/null 2>&1 || :
fi
%endif
+%endif
%preun
%if %{with systemd}
+%if 0%{?fedora} >= 18
+ %systemd_preun %{name}.service
+%else
# Work around RHBZ #655116
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl disable bitlbee.service > /dev/null 2>&1 || :
- /bin/systemctl stop bitlbee.service > /dev/null 2>&1 || :
+if [ $1 -eq 0 ]; then
+ # Package removal, not upgrade
+ /bin/systemctl disable %{name}.service > /dev/null 2>&1 || :
+ /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
fi
+%endif
%else
if [ $1 -eq 0 ]; then
- /sbin/service xinetd condrestart > /dev/null 2>&1
+ /sbin/service xinetd condrestart > /dev/null 2>&1
fi
%endif
%postun
%if %{with systemd}
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart bitlbee.service >/dev/null 2>&1 || :
+%if 0%{?fedora} >= 18
+ %systemd_postun_with_restart %{name}.service
+%else
+/bin/systemctl daemon-reload > /dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart%{name}.service > /dev/null 2>&1 || :
fi
%endif
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -215,6 +225,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed Feb 20 2013 Robert Scheck <robert at fedoraproject.org> 3.2-1
+- Upgrade to 3.2 (#912675, thanks to Eike Hein and Rex Dieter)
+- Use the new systemd macros (#850048, thanks to Václav Pavlín)
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 850bf33..18b9b41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ff97260a2a7f3a7d102db158a8d9887 bitlbee-3.0.5.tar.gz
+6a8fe98e96a47c636004a245075d5d7c bitlbee-3.2.tar.gz
More information about the scm-commits
mailing list