X-Git-Url: https://git.pld-linux.org/?p=packages%2Firssi.git;a=blobdiff_plain;f=irssi.spec;h=615debc643e53b6c5aeda72e2299404bf09d0dee;hp=8f661ad3d028109897fe75d598b7360e5e28ea53;hb=b443568ee5cf4a89a3aeeab0a554e72e31628388;hpb=7de6b4cc7fa33864d165d00a6eb329bdad3b301e

diff --git a/irssi.spec b/irssi.spec
index 8f661ad..615debc 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -4,30 +4,34 @@
 %bcond_without	ipv6	# without IPv6 support
 %bcond_without	ssl	# without SSL  support
 %bcond_without	dynamic	# without dynamic libraries
+%bcond_without	xmpp	# without plugin
 
 %define		no_install_post_check_so	1
 
 %define		idea_ver	0.1.46
-%define		irssi_perl_version 20100403
+%define		xmpp_ver	0.52
+%define		irssi_perl_version 20140111
 %{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	Irssi is a IRC client
 Summary(fr.UTF-8):	Irssi est un client IRC
 Summary(hu.UTF-8):	Irssi egy IRC kliens
 Summary(pl.UTF-8):	Irssi - wygodny w użyciu klient IRC
 Name:		irssi
-Version:	0.8.15
-Release:	9
+Version:	0.8.16
+Release:	2
 License:	GPL
 Group:		Applications/Communications
 #Source0:	http://www.irssi.org/files/snapshots/%{name}-%{_snap}.tar.gz
 Source0:	http://www.irssi.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	870db8e319f640c2bf446c30d0c24ef6
+# Source0-md5:	5a8ee7144b63fa01747d6f400c40ef34
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 # NXDOMAIN
 #Source3:	http://real.irssi.org/files/plugins/idea/%{name}-idea-%{idea_ver}.tar.gz
 Source3:	%{name}-idea-%{idea_ver}.tar.gz
 # Source3-md5:	c326efe317b8f67593a3cd46d5557280
+Source4:	http://cybione.org/~irssi-xmpp/files/irssi-xmpp-%{xmpp_ver}.tar.gz
+# Source4-md5:	f48d66ddf6a6d8e4d04bfc44b83dc3c7
 Patch0:		%{name}-dcc-send-limit.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-idea-listlen.patch
@@ -36,6 +40,7 @@ Patch4:		%{name}-dynamic.patch
 Patch5:		%{name}-invalid_free.patch
 Patch6:		%{name}-color_support_for_gui_entry.patch
 Patch7:		%{name}-libs-nopoison.patch
+Patch8:		am.patch
 URL:		http://www.irssi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -44,6 +49,7 @@ BuildRequires:	gettext-devel
 BuildRequires:	glib-devel
 BuildRequires:	glib2-devel >= 2.24.0
 BuildRequires:	libtool
+%{?with_xmpp:BuildRequires:	loudmouth-devel}
 BuildRequires:	ncurses-devel >= 5.0
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_perl:BuildRequires:	perl-devel >= 1:5.8.4}
@@ -91,8 +97,20 @@ Ez a csomag tartalmazza az IDEA titkosítási plugint Irssi-hez.
 %description plugin-idea -l pl.UTF-8
 Ten pakiet zawiera wtyczkę do Irssi z szyfrowaniem IDEA.
 
+%package plugin-xmpp
+Summary:	Irssi XMPP support plugin
+Summary(pl.UTF-8):	Wtyczka do irssi do obsługi XMPP
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-xmpp
+This package contains XMPP support plugin for Irssi.
+
+%description plugin-xmpp -l pl.UTF-8
+Ten pakiet zawiera wtyczkę do Irssi z obsługą XMPP.
+
 %prep
-%setup -q -a3
+%setup -q -a3 -a4
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -107,6 +125,8 @@ Ten pakiet zawiera wtyczkę do Irssi z szyfrowaniem IDEA.
 echo 'AC_DEFUN([AM_PATH_GLIB],[:])' > glib1.m4
 
 mv irssi-idea{-%{idea_ver},}
+mv irssi-xmpp{-%{xmpp_ver},}
+%patch8 -p1
 
 # hack
 %{__sed} -i -e 's#\./libtool#%{_bindir}/libtool#g' 'configure.in'
@@ -148,6 +168,11 @@ cd irssi-idea
 %configure
 %{__make}
 
+cd ..
+export IRSSI_INCLUDE=`pwd`
+cd irssi-xmpp
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
@@ -164,6 +189,11 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 %{__make} -C irssi-idea install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__make} -C irssi-xmpp install \
+	PREFIX=%{_prefix} \
+	IRSSI_LIB=%{_libdir}/%{name} \
+	DESTDIR=$RPM_BUILD_ROOT
+
 # -devel?
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.{so,la,a}
 rm -r $RPM_BUILD_ROOT%{_includedir}/irssi
@@ -207,22 +237,25 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/Irssi/*.pm
 
 %dir %{perl_vendorarch}/auto/Irssi
-%{perl_vendorarch}/auto/Irssi/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Irssi/*.so
 
 %dir %{perl_vendorarch}/auto/Irssi/Irc
-%{perl_vendorarch}/auto/Irssi/Irc/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Irssi/Irc/*.so
 
 %dir %{perl_vendorarch}/auto/Irssi/TextUI
-%{perl_vendorarch}/auto/Irssi/TextUI/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Irssi/TextUI/*.so
 
 %dir %{perl_vendorarch}/auto/Irssi/UI
-%{perl_vendorarch}/auto/Irssi/UI/*.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Irssi/UI/*.so
 %endif
 
 %files plugin-idea
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/irssi/modules/libidea.so
+
+%files plugin-xmpp
+%defattr(644,root,root,755)
+%doc irssi-xmpp/{docs/*,NEWS,README,TODO}
+%attr(755,root,root) %{_libdir}/irssi/modules/libfe_xmpp.so
+%attr(755,root,root) %{_libdir}/irssi/modules/libtext_xmpp.so
+%attr(755,root,root) %{_libdir}/irssi/modules/libxmpp_core.so