[bitlbee: 1/2] Attempt to package 3.0.2.
Matej Cepl
mcepl at fedoraproject.org
Wed Mar 9 09:42:14 UTC 2011
commit 4069518a21cee7f2e6508a964ae745fd260c89a7
Author: Matěj Cepl <mcepl at redhat.com>
Date: Wed Mar 9 10:38:09 2011 +0100
Attempt to package 3.0.2.
.gitignore | 1 +
bitlbee-ssl_pending.patch | 19 -----
bitlbee-systemd.patch | 170 ++++++++++++++++++--------------------------
bitlbee.spec | 11 ++--
sources | 2 +-
5 files changed, 77 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3106911..f267a3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
bitlbee-1.2.8.tar.gz
bitlbee-3.0.tar.gz
/bitlbee-3.0.1.tar.gz
+/bitlbee-3.0.2.tar.gz
diff --git a/bitlbee-systemd.patch b/bitlbee-systemd.patch
index 202f0b3..7604bed 100644
--- a/bitlbee-systemd.patch
+++ b/bitlbee-systemd.patch
@@ -1,73 +1,6 @@
-From 5b54c3a0287a92008f1a795af45c43445a4daac9 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at frugalware.org>
-Date: Mon, 27 Dec 2010 17:14:27 +0100
-Subject: [PATCH] systemd: install systemd unit files
-
-bitlbee.service provides ForkDaemon mode,
-bitlbee.socket/bitlbee at .service is available as well for the depreceated
-inetd mode.
----
- Makefile | 20 +++++++++++++++++---
- configure | 19 +++++++++++++++++++
- init/bitlbee.service.in | 9 +++++++++
- init/bitlbee.socket | 9 +++++++++
- init/bitlbee at .service.in | 8 ++++++++
- 5 files changed, 62 insertions(+), 3 deletions(-)
- create mode 100644 init/bitlbee.service.in
- create mode 100644 init/bitlbee.socket
- create mode 100644 init/bitlbee at .service.in
-
-diff --git a/Makefile b/Makefile
-index 24ef216..9afd4e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,18 +26,18 @@ endif
- # Expansion of variables
- subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
-
--all: $(OUTFILE) $(OTR_PI)
-+all: $(OUTFILE) $(OTR_PI) systemd
- $(MAKE) -C doc
-
- uninstall: uninstall-bin uninstall-doc
- @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
-
--install: install-bin install-doc install-plugins
-+install: install-bin install-doc install-plugins install-systemd
- @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
- @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
- @echo
-
--.PHONY: install install-bin install-etc install-doc install-plugins \
-+.PHONY: install install-bin install-etc install-doc install-plugins install-systemd \
- uninstall uninstall-bin uninstall-etc uninstall-doc \
- all clean distclean tar $(subdirs)
-
-@@ -109,6 +109,20 @@ ifdef OTR_PI
- install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
- endif
-
-+systemd:
-+ifdef SYSTEMDSYSTEMUNITDIR
-+ sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+ sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
-+endif
-+
-+install-systemd:
-+ifdef SYSTEMDSYSTEMUNITDIR
-+ 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)
-+endif
-+
- tar:
- fakeroot debian/rules clean || make distclean
- x=$$(basename $$(pwd)); \
-diff --git a/configure b/configure
-index 3a3796d..8617d60 100755
---- a/configure
-+++ b/configure
+diff -up bitlbee-3.0.2/configure.systemd bitlbee-3.0.2/configure
+--- bitlbee-3.0.2/configure.systemd 2011-03-09 09:46:37.263884813 +0100
++++ bitlbee-3.0.2/configure 2011-03-09 09:47:39.983708602 +0100
@@ -15,6 +15,7 @@ datadir='$prefix/share/bitlbee/'
config='/var/lib/bitlbee/'
plugindir='$prefix/lib/bitlbee/'
@@ -76,7 +9,7 @@ index 3a3796d..8617d60 100755
libevent='/usr/'
pidfile='/var/run/bitlbee.pid'
ipcsocket='/var/run/bitlbee.sock'
-@@ -62,6 +63,7 @@ Option Description Default
+@@ -61,6 +62,7 @@ Option Description Default
--mandir=... $mandir
--datadir=... $datadir
--plugindir=... $plugindir
@@ -84,7 +17,7 @@ index 3a3796d..8617d60 100755
--pidfile=... $pidfile
--config=... $config
--ipcsocket=... $ipcsocket
-@@ -487,6 +489,17 @@ else
+@@ -488,6 +490,17 @@ else
fi;
fi
@@ -102,7 +35,7 @@ index 3a3796d..8617d60 100755
if [ "$gcov" = "1" ]; then
echo "CFLAGS+=--coverage" >> Makefile.settings
echo "EFLAGS+=--coverage" >> Makefile.settings
-@@ -740,6 +753,12 @@ else
+@@ -728,6 +741,12 @@ else
echo ' Off-the-Record (OTR) Messaging disabled.'
fi
@@ -114,12 +47,10 @@ index 3a3796d..8617d60 100755
+
echo ' Using event handler: '$events
echo ' Using SSL library: '$ssl
- echo ' Building with these storage backends: '$STORAGES
-diff --git a/init/bitlbee.service.in b/init/bitlbee.service.in
-new file mode 100644
-index 0000000..95cbe25
---- /dev/null
-+++ b/init/bitlbee.service.in
+ #echo ' Building with these storage backends: '$STORAGES
+diff -up bitlbee-3.0.2/init/bitlbee.service.in.systemd bitlbee-3.0.2/init/bitlbee.service.in
+--- bitlbee-3.0.2/init/bitlbee.service.in.systemd 2011-03-09 09:46:37.266884804 +0100
++++ bitlbee-3.0.2/init/bitlbee.service.in 2011-03-09 09:46:37.266884804 +0100
@@ -0,0 +1,9 @@
+[Unit]
+Description=BitlBee IRC/IM gateway
@@ -130,11 +61,21 @@ index 0000000..95cbe25
+
+[Install]
+WantedBy=multi-user.target
-diff --git a/init/bitlbee.socket b/init/bitlbee.socket
-new file mode 100644
-index 0000000..e5ceb47
---- /dev/null
-+++ b/init/bitlbee.socket
+diff -up bitlbee-3.0.2/init/bitlbee at .service.in.systemd bitlbee-3.0.2/init/bitlbee at .service.in
+--- bitlbee-3.0.2/init/bitlbee at .service.in.systemd 2011-03-09 09:46:37.267884801 +0100
++++ bitlbee-3.0.2/init/bitlbee at .service.in 2011-03-09 09:46:37.267884801 +0100
+@@ -0,0 +1,8 @@
++[Unit]
++Description=BitlBee Per-Connection Server
++After=syslog.target
++
++[Service]
++ExecStart=@sbindir at bitlbee
++StandardInput=socket
++User=bitlbee
+diff -up bitlbee-3.0.2/init/bitlbee.socket.systemd bitlbee-3.0.2/init/bitlbee.socket
+--- bitlbee-3.0.2/init/bitlbee.socket.systemd 2011-03-09 09:46:37.267884801 +0100
++++ bitlbee-3.0.2/init/bitlbee.socket 2011-03-09 09:46:37.267884801 +0100
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=bitlbee.service
@@ -145,20 +86,49 @@ index 0000000..e5ceb47
+
+[Install]
+WantedBy=sockets.target
-diff --git a/init/bitlbee at .service.in b/init/bitlbee at .service.in
-new file mode 100644
-index 0000000..8b576a4
---- /dev/null
-+++ b/init/bitlbee at .service.in
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=BitlBee Per-Connection Server
-+After=syslog.target
+diff -up bitlbee-3.0.2/Makefile.systemd bitlbee-3.0.2/Makefile
+--- bitlbee-3.0.2/Makefile.systemd 2011-03-08 07:56:10.000000000 +0100
++++ bitlbee-3.0.2/Makefile 2011-03-09 09:46:37.266884804 +0100
+@@ -26,18 +26,18 @@ endif
+ # Expansion of variables
+ subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
+
+-all: $(OUTFILE) $(OTR_PI)
++all: $(OUTFILE) $(OTR_PI) systemd
+ $(MAKE) -C doc
+
+ uninstall: uninstall-bin uninstall-doc
+ @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
+
+-install: install-bin install-doc install-plugins
++install: install-bin install-doc install-plugins install-systemd
+ @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
+ @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
+ @echo
+
+-.PHONY: install install-bin install-etc install-doc install-plugins \
++.PHONY: install install-bin install-etc install-doc install-plugins install-systemd \
+ uninstall uninstall-bin uninstall-etc uninstall-doc \
+ all clean distclean tar $(subdirs)
+
+@@ -109,6 +109,20 @@ ifdef OTR_PI
+ install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+ endif
+
++systemd:
++ifdef SYSTEMDSYSTEMUNITDIR
++ sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
++ sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
++endif
+
-+[Service]
-+ExecStart=@sbindir at bitlbee
-+StandardInput=socket
-+User=bitlbee
---
-1.7.3.4
-
++install-systemd:
++ifdef SYSTEMDSYSTEMUNITDIR
++ 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)
++endif
++
+ tar:
+ fakeroot debian/rules clean || make distclean
+ x=$$(basename $$(pwd)); \
diff --git a/bitlbee.spec b/bitlbee.spec
index 7920675..ecab27f 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,7 +1,7 @@
Summary: IRC to other chat networks gateway
Name: bitlbee
-Version: 3.0.1
-Release: 8%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
URL: http://www.bitlbee.org/
@@ -14,8 +14,6 @@ Patch0: bitlbee-syslibdirs.patch
Patch1: bitlbee-installP.patch
# support for old glibc (EL-4, EL-5) which doesn't have ns_initparse and its friends
Patch2: bitlbee-libresolv.patch
-# Fix for missing ssl_pending() function (upstream #368, RHBZ #665553)
-Patch3: bitlbee-ssl_pending.patch
# Completion of NSS-based SSL implementation. Sent upstream. #714
# (combined with two tiny fixes from RHBZ #666022)
Patch4: bitlbee-des3-implement.patch
@@ -72,7 +70,6 @@ completely stable and not 100% foolproof so use at your own risk.
%if 0%{?fedora}%{?rhel} < 6
%patch2 -p1 -b .libresolv
%endif
-%patch3 -p0 -b .sslPending
%patch4 -p1 -b .des3
%if 0%{?fedora} >= 15
%patch5 -p1 -b .systemd
@@ -97,7 +94,8 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
--otr=plugin
%endif
-make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
+#make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -187,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/%{name}.pc
%if 0%{?fedora}%{?rhel} >= 6
+%defattr(-,root,root,-)
%files otr
%{_libdir}/%{name}/otr.so
%endif
diff --git a/sources b/sources
index a3324be..a0d4951 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d00c6e09859b653f955b16b988db0ac bitlbee-3.0.1.tar.gz
+214084bd2980047288d2c71c6b5052b7 bitlbee-3.0.2.tar.gz
More information about the scm-commits
mailing list