packages: bitlbee/bitlbee.spec - up to 3.0.5, add -devel and -otr subpackages

[glen]

Author: glen                         Date: Sat Apr 14 21:46:30 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.5, add -devel and -otr subpackages

---- Files affected:
packages/bitlbee:
   bitlbee.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/bitlbee/bitlbee.spec
diff -u packages/bitlbee/bitlbee.spec:1.8 packages/bitlbee/bitlbee.spec:1.9
--- packages/bitlbee/bitlbee.spec:1.8	Tue Jan 20 23:34:11 2009
+++ packages/bitlbee/bitlbee.spec	Sat Apr 14 23:46:25 2012
@@ -1,21 +1,31 @@
 # $Revision$, $Date$
+# TODO
+# - sync pl
+# - bilbee user
+#
+# Conditional build:
+%bcond_without	otr		# build without OTR
+
 Summary:	An IRC to other chat networks gateway
 Summary(pl.UTF-8):	Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi
 Name:		bitlbee
-Version:	1.2.3
-Release:	1
-License:	GPL
+Version:	3.0.5
+Release:	0.1
+License:	GPL v2+ and MIT
 Group:		Daemons
 Source0:	http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
-# Source0-md5:	2b1674d98804970809de3da3edf0bed2
+# Source0-md5:	9ff97260a2a7f3a7d102db158a8d9887
 URL:		http://www.bitlbee.org/
 BuildRequires:	gnutls-devel
+%{?with_otr:BuildRequires:	libotr-devel >= 3.2.0}
+BuildRequires:	systemd-units
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-An IRC to other chat networks gateway. This program can be used as an
-IRC server which forwards everything you say to people on other chat
-networks like MSN/ICQ/Jabber.
+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 ICQ/AIM, MSN, XMPP/Jabber (including Google Talk),
+Yahoo or Twitter!
 
 %description -l pl.UTF-8
 Bramka pomiędzy IRC-em i innymi sieciami komunikacyjnymi. Ten program
@@ -23,34 +33,62 @@
 ludzi korzystających z innych sieci komunikacyjnych, takich jak
 MSN/ICQ/Jabber.
 
+%package devel
+Summary:	Development files for bitlbee
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+The bitlbee-devel package includes header files necessary for building
+and developing programs and plugins which use bitlbee.
+
+%package otr
+Summary:	OTR plugin for bitlbee
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description otr
+The bitlbee-otr package includes OTR plugin for bitlbee. Not
+completely stable and not 100% foolproof so use at your own risk.
+
 %prep
 %setup -q
 
+# fix wrong assumption with $DESTDIR
+%{__sed} -i -e 's,$(shell id -u),0,' Makefile
+
 %build
+CFLAGS="%{rpmcflags}" \
 ./configure \
-	--datadir="%{_datadir}/bitlbee" \
-	--etcdir=%{_sysconfdir} \
 	--prefix=%{_prefix} \
-	--ssl=gnutls
+	--bindir=%{_sbindir} \
+	--etcdir=%{_sysconfdir}/%{name} \
+	--mandir=%{_mandir} \
+	--datadir=%{_datadir}/%{name} \
+	--config=%{_localstatedir}/lib/%{name} \
+	--pcdir=%{_pkgconfigdir} \
+	--plugindir=%{_libdir}/%{name} \
+	--strip=0 \
+	--plugins=1 \
+	--ssl=gnutls \
+%if %{with otr}
+	--otr=plugin \
+%endif
 
 %{__make}
+
 ### FIXME: Documentation needs old sgmltools tool, deprecated.
 #%{__make} -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 
-install -d $RPM_BUILD_ROOT%{_sbindir} \
-	$RPM_BUILD_ROOT%{_datadir}/bitlbee/ \
-	$RPM_BUILD_ROOT%{_mandir}/man{5,8}/ \
-	$RPM_BUILD_ROOT%{_localstatedir}/lib/bitlbee
-
-%{__make} install \
+%{__make} install install-dev install-etc install-systemd \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install bitlbee $RPM_BUILD_ROOT%{_sbindir}
-install doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+# Install some files manually to their correct destination
+#install -d $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,10 +96,28 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
-%{_mandir}/man?/*
-%attr(755,root,root) %{_sbindir}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/bitlbee.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/motd.txt
+%attr(755,root,root) %{_sbindir}/bitlbee
+%{_mandir}/man5/bitlbee.conf.5*
+%{_mandir}/man8/bitlbee.8*
 %{_datadir}/bitlbee
 %attr(700,root,root) %{_localstatedir}/lib/bitlbee
+%{systemdunitdir}/bitlbee.service
+%{systemdunitdir}/bitlbee.socket
+%{systemdunitdir}/bitlbee at .service
+
+%files devel
+%defattr(644,root,root,755)
+%doc doc/example_plugin.c
+%{_includedir}/%{name}
+%{_pkgconfigdir}/%{name}.pc
+
+%if %{with otr}
+%files otr
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/otr.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/04/14 21:46:25  glen
+- up to 3.0.5, add -devel and -otr subpackages
+
 Revision 1.8  2009/01/20 22:34:11  duddits
 - up to 1.2.3, fixes CVE-2008-3969
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/bitlbee/bitlbee.spec?r1=1.8&r2=1.9