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

diff --git a/irssi.spec b/irssi.spec
index a80ccd7..ea451c4 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,29 +1,26 @@
 #
 # 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		xmpp_ver	0.52
-%define		irssi_perl_version 20141011
+%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.17
-Release:	3
+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:	00cde2ba7ba37af9e3df451f430ecdea
+Source0:	https://github.com/irssi/irssi/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	8c2c494b2a7e3ab3ea6657f413ec890c
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 # NXDOMAIN
@@ -31,7 +28,7 @@ Source2:	%{name}.png
 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
+# Source4-md5:	8c9906e4efbd6f3c8bd8420f0ac8fd91
 Patch0:		%{name}-dcc-send-limit.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-idea-listlen.patch
@@ -41,6 +38,8 @@ 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
@@ -51,7 +50,7 @@ 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
@@ -127,6 +126,8 @@ 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.ac'
@@ -143,19 +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-true-color \
-	--enable-nls \
-	--%{?with_ssl:en}%{!?with_ssl:dis}able-ssl
+	--enable-true-color
 
 %{__make}
 
@@ -166,10 +164,11 @@ cd irssi-idea
 %{__aclocal} -I .
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
-
 cd ..
+
 export IRSSI_INCLUDE=`pwd`
 cd irssi-xmpp
 %{__make}
@@ -178,8 +177,8 @@ cd irssi-xmpp
 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/*