From df7d643fe15f342b7648dc96f5d47444affc669f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 14 Jun 2022 19:52:58 +0200
Subject: [PATCH] New version

  Resolves: rhbz#2095992
---
 irssi-1.4.1-botti-perl-link-fix.patch | 43 +++++++++++++++++++++++++++
 irssi.spec                            | 42 ++++++++++++++++++--------
 2 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 irssi-1.4.1-botti-perl-link-fix.patch

diff --git a/irssi-1.4.1-botti-perl-link-fix.patch b/irssi-1.4.1-botti-perl-link-fix.patch
new file mode 100644
index 0000000..7a7efdc
--- /dev/null
+++ b/irssi-1.4.1-botti-perl-link-fix.patch
@@ -0,0 +1,43 @@
+diff --git a/configure.ac b/configure.ac
+index f03569e..53a9de6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -650,6 +650,7 @@ for c in $CHAT_MODULES; do
+ done
+ 
+ FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
++AC_SUBST(FE_COMMON_LIBS)
+ 
+ dnl ** common libraries needed by frontends
+ COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS"
+diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am
+index bbcd63f..e8ce8d6 100644
+--- a/src/fe-none/Makefile.am
++++ b/src/fe-none/Makefile.am
+@@ -4,12 +4,13 @@ AM_CPPFLAGS = \
+ 	-I$(top_builddir) \
+ 	$(GLIB_CFLAGS)
+ 
+-botti_DEPENDENCIES = @COMMON_NOUI_LIBS@
++botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ @FE_COMMON_LIBS@
+ 
+ botti_LDADD = \
+ 	@COMMON_NOUI_LIBS@ \
+ 	@PERL_LINK_LIBS@ \
+ 	@PERL_LINK_FLAGS@ \
++	@FE_COMMON_LIBS@ \
+ 	@PROG_LIBS@
+ 
+ botti_SOURCES = \
+diff --git a/src/fe-none/meson.build b/src/fe-none/meson.build
+index 58df15f..8e32b94 100644
+--- a/src/fe-none/meson.build
++++ b/src/fe-none/meson.build
+@@ -11,6 +11,7 @@ executable('botti',
+     libconfig_a,
+     libcore_a,
+     libirc_a,
++    libfe_common_core_a,
+   ],
+   install : true,
+   dependencies : dep
diff --git a/irssi.spec b/irssi.spec
index 74721f7..df599fc 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -2,8 +2,8 @@
 
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
-Version:	1.2.3
-Release:	6%{?dist}
+Version:	1.4.1
+Release:	1%{?dist}
 
 License:	GPLv2+
 URL:		http://irssi.org/
@@ -11,18 +11,31 @@ Source0:	https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}
 Source1:	irssi-config.h
 
 BuildRequires:	make
-BuildRequires:	ncurses-devel openssl-devel zlib-devel
-BuildRequires:	pkgconfig glib2-devel perl-devel perl-generators perl(ExtUtils::Embed)
-BuildRequires:	autoconf automake libtool utf8proc-devel libotr-devel
+BuildRequires:	ncurses-devel
+BuildRequires:	openssl-devel
+BuildRequires:	zlib-devel
+BuildRequires:	pkgconf-pkg-config
+BuildRequires:	glib2-devel
+BuildRequires:	perl-devel
+BuildRequires:	perl-generators
+BuildRequires:	perl(ExtUtils::Embed)
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	utf8proc-devel
+BuildRequires:	libotr-devel
 
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(lib)
 Requires:	perl(Symbol)
+# https://github.com/irssi/irssi/issues/1374
+Patch0:		irssi-1.4.1-botti-perl-link-fix.patch
 
 
 %package devel
 Summary:	Development package for irssi
 Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconf-pkg-config
 
 %description
 Irssi is a modular IRC client with Perl scripting. Only text-mode
@@ -38,38 +51,36 @@ being maintained.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
-autoreconf -i
+autoreconf -fi
 %configure --with-textui		\
 	--with-proxy			\
 	--with-bot			\
-	--with-perl=yes			\
+	--with-perl=module		\
 	--with-perl-lib=vendor		\
 	--enable-true-color		\
 	--with-otr=yes
 
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 mv irssi-config.h irssi-config-$(getconf LONG_BIT).h
 cp -p %{SOURCE1} irssi-config.h
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+%make_install
 install -p irssi-config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/%{name}/irssi-config-$(getconf LONG_BIT).h
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
 rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
+rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
 chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
 
-
-
 %files
 %doc docs/*.txt docs/*.html AUTHORS COPYING NEWS README.md TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
@@ -84,9 +95,14 @@ chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
 
 %files devel
 %{_includedir}/irssi/
+%{_libdir}/pkgconfig/irssi-1.pc
 
 
 %changelog
+* Tue Jun 14 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.1-1
+- New version
+  Resolves: rhbz#2095992
+
 * Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.2.3-6
 - Perl 5.36 rebuild