X-Git-Url: https://git.pld-linux.org/?p=packages%2Firssi.git;a=blobdiff_plain;f=irssi.spec;h=1df164ddb930dbbf69a5f4919290391b3db296a3;hp=d52f274acaad219ddbd8d7bb78379bfa8a60e335;hb=51b33c8bc71453595bb2cadf56d3783f70a2e11a;hpb=e030c78a0a2229e73e4d3349b2ae9293ff05e11e

diff --git a/irssi.spec b/irssi.spec
index d52f274..1df164d 100644
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,34 +1,45 @@
-%{!?_without_perl:%include	/usr/lib/rpm/macros.perl}
+# TODO:
+# - package with some nice scripts + forwardfix.pl
+#
+# Conditional build:
+%bcond_without	perl	# without perl support
+%bcond_without	ipv6	# without IPv6 support
+%bcond_without	ssl	# without SSL  support
+#
+%define         _rel rc5
 %define		_idea_ver	0.1.46
-
+%{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	Irssi is a IRC client
 Summary(fr):	Irssi est un client IRC
 Summary(pl):	Irssi - wygodny w u¿yciu klient IRC
 Name:		irssi
-Version:	0.8.8
-Release:	0.1
+Version:	0.8.10
+Release:	0.%{_rel}
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://real.irssi.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	7220d149b938012c96b064767dafc7de
+Source0:	http://real.irssi.org/files/%{name}-%{version}-%{_rel}.tar.gz
+# Source0-md5:	7c0b6c1533c85e918f41ded1238e4ca1
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-Source3:        http://www.irssi.org/files/plugins/idea/%{name}-idea-%{_idea_ver}.tar.gz
+Source3:	http://www.irssi.org/files/plugins/idea/%{name}-idea-%{_idea_ver}.tar.gz
 # Source3-md5:	c326efe317b8f67593a3cd46d5557280
-#Patch0:		%{name}-dcc-send-limit.patch
+Patch0:		%{name}-dcc-send-limit.patch
 Patch1:		%{name}-channel_auto_who.patch
 Patch2:		%{name}-tinfo.patch
 Patch3:		%{name}-home_etc.patch
+Patch4:		%{name}.conf.patch
+Patch5:		%{name}-idea-listlen.patch
 URL:		http://www.irssi.org/
-BuildRequires:	automake
 BuildRequires:	autoconf
-BuildRequires:	libtool
+BuildRequires:	automake
 BuildRequires:	gettext-devel
+BuildRequires:	glib-devel
 BuildRequires:	glib2-devel >= 2.1.0
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	openssl-devel >= 0.9.7c
-BuildRequires:	glib-devel
-%{?!_without_perl:BuildRequires:	perl-devel >= 5.6.1}
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
+%{?with_perl:BuildRequires:	perl-devel >= 1:5.8.4}
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	%{name}-speech
 Obsoletes:	%{name}-sql
@@ -43,9 +54,9 @@ Irssi est client IRC.
 Irssi jest tekstowym klientem IRC ze wsparciem dla IPv6.
 
 %package plugin-idea
-Summary:        Irssi plugin IDEA crypt
-Summary(pl):    Wtyczka do irssi do szyfrowania IDEA
-Group:          Applications/Communications
+Summary:	Irssi plugin IDEA crypt
+Summary(pl):	Wtyczka do irssi do szyfrowania IDEA
+Group:		Applications/Communications
 Requires:	%{name} = %{version}
 
 %description plugin-idea
@@ -55,11 +66,13 @@ This package contains IDEA Crypt plugin for Irssi.
 Ten pakiet zawiera wtyczkê do Irssi z szyfrowaniem IDEA.
 
 %prep
-%setup -q -a3
-#%patch0 -p1
+%setup -q -n %{name}-%{version}-%{_rel} -a3
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 rm -f missing
@@ -74,11 +87,12 @@ rm -f missing
 	--with-proxy \
 	--with-terminfo \
 	--with-modules \
-	%{?!_without_perl:--with-perl=yes} \
-	%{?!_without_perl:--with-perl-lib=vendor} \
-	%{?_without_perl:--with-perl=no} \
-	--enable-ipv6 \
-	--enable-nls
+	%{?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
 
 %{__make}
 
@@ -95,17 +109,16 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_applnkdir}/Network/Communications}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	docdir=%{_datadir}/%{name}-%{version}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-cd irssi-idea-%{_idea_ver}
-%{__make} install \
+%{__make} -C irssi-idea-%{_idea_ver} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -113,18 +126,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO NEWS docs/*.txt
+%doc AUTHORS ChangeLog README TODO NEWS docs/*.{txt,html}
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/irssi
 %dir %{_libdir}/irssi/modules
 %attr(755,root,root) %{_libdir}/irssi/modules/libirc_proxy.so*
 %{_datadir}/%{name}
-%{_applnkdir}/Network/Communications/irssi.desktop
+%{_desktopdir}/irssi.desktop
 %{_pixmapsdir}/*
 %{_sysconfdir}/irssi.conf
 %{_mandir}/man1/*
 
-%if %{?!_without_perl:1}0
+%if %{with perl}
 %{perl_vendorarch}/*.pm
 %dir %{perl_vendorarch}/Irssi
 %{perl_vendorarch}/Irssi/*.pm