X-Git-Url: https://git.pld-linux.org/?p=packages%2Firssi.git;a=blobdiff_plain;f=irssi.spec;h=ea451c4d7b72d95a36fbc195ac02664f7edd61e5;hp=821681cd1e997dc46c65cdcd5a8073fde5b23a03;hb=3d50ca019d68812ea0af35c992e8dde8caf8fba0;hpb=4f0eed987bbc181d3c624b34ba62b1f643cd8141

diff --git a/irssi.spec b/irssi.spec
index 821681c..ea451c4 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,50 +1,56 @@
 #
 # Conditional build:
 %bcond_without	perl	# without perl support
-%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.53
+%define		irssi_perl_version 20180213
 %{?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:	6
+Version:	1.1.1
+Release:	5
 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:	https://github.com/irssi/irssi/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	8c2c494b2a7e3ab3ea6657f413ec890c
 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:	8c9906e4efbd6f3c8bd8420f0ac8fd91
 Patch0:		%{name}-dcc-send-limit.patch
-Patch1:		%{name}-tinfo.patch
-Patch2:		%{name}-home_etc.patch
-Patch3:		%{name}-idea-listlen.patch
-Patch4:		%{name}-gcc4.patch
-Patch5:		%{name}-dynamic.patch
-Patch6:		%{name}-invalid_free.patch
-Patch7:		%{name}-color_support_for_gui_entry.patch
-Patch8:		%{name}-libs-nopoison.patch
+Patch1:		%{name}-home_etc.patch
+Patch2:		%{name}-idea-listlen.patch
+Patch3:		%{name}-gcc4.patch
+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
+Patch9:		%{name}-idea-glib.patch
+Patch10:	%{name}-xmpp.patch
 URL:		http://www.irssi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 # for idea only
 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}
+BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_perl:BuildRequires:	perl-devel >= 1:5.8.4}
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
@@ -90,26 +96,41 @@ 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
 %patch3 -p1
-%patch4 -p1
 %if %{with dynamic}
-%patch5 -p1
+%patch4 -p1
 %endif
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
+%patch5 -p1
+%patch6 -p0
+%patch7 -p1
 
 echo 'AC_DEFUN([AM_PATH_GLIB],[:])' > glib1.m4
 
 mv irssi-idea{-%{idea_ver},}
+mv irssi-xmpp{-%{xmpp_ver},}
+%patch8 -p1
+%patch9 -p0
+%patch10 -p0
 
 # hack
-%{__sed} -i -e 's#\./libtool#%{_bindir}/libtool#g' 'configure.in'
+%{__sed} -i -e 's#\./libtool#%{_bindir}/libtool#g' 'configure.ac'
 
 %build
 ver=$(awk '/IRSSI_VERSION_DATE/{print $3}' irssi-version.h)
@@ -123,18 +144,16 @@ fi
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--without-socks \
 	--with-bot \
 	--with-textui \
 	--with-proxy \
-	--with-terminfo \
 	--with-modules \
 	%{?with_perl:--with-perl=yes} \
 	%{?with_perl:--with-perl-lib=vendor} \
 	%{!?with_perl:--with-perl=no} \
-	%{?with_ipv6:--enable-ipv6} \
-	--enable-nls \
-	--%{?with_ssl:en}%{!?with_ssl:dis}able-ssl
+	--enable-true-color
 
 %{__make}
 
@@ -145,15 +164,21 @@ cd irssi-idea
 %{__aclocal} -I .
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
+%{__make}
+cd ..
+
+export IRSSI_INCLUDE=`pwd`
+cd irssi-xmpp
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	docdir=%{_datadir}/%{name}-%{version}
+	docdir=%{_datadir}/%{name}-%{version} \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # scripts packaged by irssi-scripts.spec
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/*
@@ -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
@@ -183,7 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO NEWS docs/*.{txt,html}
+%doc AUTHORS ChangeLog README.md TODO NEWS docs/*.{txt,html}
 %attr(755,root,root) %{_bindir}/botti
 %attr(755,root,root) %{_bindir}/irssi
 %dir %{_libdir}/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